gh-128438: Add EnvironmentVarGuard for test_builtin.py, test_io.py and test_locale.py
#128476
+14
−33
Conversation
This file contains 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
picnixz
reviewed
Jan 4, 2025
picnixz
reviewed
Jan 11, 2025
|
|
||
| if 'LC_CTYPE' not in orig_env: | ||
| del os.environ['LC_CTYPE'] | ||
| env['LC_CTYPE'] = 'UTF-8' |
There was a problem hiding this comment.
To mimic env.unset maybe use env.set?
Comment on lines
+512
to
+513
| if orig_getlocale is not None: | ||
| _locale._getdefaultlocale = orig_getlocale |
There was a problem hiding this comment.
Maybe just in case, keep a huge try-finally and the environment guard inside that block:
try:
with os_helper.EnvironmentVarGuard() as env:
...
finally:
if orig_getlocale is not None:
...This would reduce the diff and ease additions in the future if we want to change the with-block.
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.
EnvironmentVarGuardin tests instead of manually messing withos.environ#128438