fix: wrap yield in try-finally in UsethisConfig.set() and change_cwd()#1834
Merged
nathanjmcdougall merged 2 commits intomainfrom Apr 7, 2026
Merged
Conversation
…), update skill, add tests Agent-Logs-Url: https://github.com/usethis-python/usethis-python/sessions/429f9231-8554-40bd-b168-73c3f152f417 Co-authored-by: nathanjmcdougall <18602289+nathanjmcdougall@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix contextlib.contextmanager state restoration on exception
fix: wrap Apr 7, 2026
yield in try-finally in UsethisConfig.set() and change_cwd()
nathanjmcdougall
approved these changes
Apr 7, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@contextmanagercleanup code placed afteryielddoesn't execute on exception — the exception re-raises at theyieldpoint, skipping everything below it. This leftusethis_configin a corrupted state (e.g.quiet=Truepermanently) when exceptions propagated throughwith usethis_config.set(...)blocks.Changes
src/usethis/_config.py— Wrapyieldintry-finallyinUsethisConfig.set()so_restore()always runssrc/usethis/_test.py— Same fix forchange_cwd()soos.chdir(old_dir)always runstests/usethis/test_config.py— Add tests verifying state restoration after exception.agents/skills/usethis-python-code/SKILL.md— Add this as a documented common mistake in the context manager guidance (v1.9)