Simplify code converting os.environ to strings (avoiding six) #28848
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
os.environ always uses str on Python 3, there's a new os.environb for a bytes version, which isn't supported on Windows: https://docs.python.org/3/library/os.html#os.environ https://docs.python.org/3/library/os.html#os.environb Simply trust os.environ to be a dict[str, str], and simplify the openssl.py code to something more like in GeckoDriverServer and elsewhere: https://github.com/web-platform-tests/wpt/blob/302039ac7c43c71bc5389104c81871b81d6cc9e0/tools/wptrunner/wptrunner/webdriver_server.py#L187-L193 Part of #28776.
wpt-pr-bot
added
infra
wptrunner
foolip
added a commit
that referenced
this pull request
May 5, 2021
This code would raise "TypeError: str expected, not bytes" is run using Python 3, since setting os.environ keys implictly encodes using sys.getfilesystemencoding(): https://docs.python.org/3/library/os.html#os.environ This might be dead code, or simply not exercised in wpt's CI. Spotted while preparing #28848.
jgraham
approved these changes
May 6, 2021
gsnedders
approved these changes
May 6, 2021
foolip
added a commit
that referenced
this pull request
May 7, 2021
This code would raise "TypeError: str expected, not bytes" is run using Python 3, since setting os.environ keys implictly encodes using sys.getfilesystemencoding(): https://docs.python.org/3/library/os.html#os.environ This might be dead code, or simply not exercised in wpt's CI. Spotted while preparing #28848.
moz-v2v-gh
pushed a commit
to mozilla/gecko-dev
that referenced
this pull request
May 9, 2021
…ry string, a=testonly Automatic update from web-platform-tests Fix setting os.environ["PATH"] to a binary string (#28849) This code would raise "TypeError: str expected, not bytes" is run using Python 3, since setting os.environ keys implictly encodes using sys.getfilesystemencoding(): https://docs.python.org/3/library/os.html#os.environ This might be dead code, or simply not exercised in wpt's CI. Spotted while preparing web-platform-tests/wpt#28848. -- wpt-commits: 3d2cc9904a08bf372bdc09c96628cc4c986278ee wpt-pr: 28849
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.
os.environ always uses str on Python 3, there's a new os.environb for a
bytes version, which isn't supported on Windows:
https://docs.python.org/3/library/os.html#os.environ
https://docs.python.org/3/library/os.html#os.environb
Simply trust os.environ to be a dict[str, str], and simplify the
openssl.py code to something more like in GeckoDriverServer and
elsewhere:
wpt/tools/wptrunner/wptrunner/webdriver_server.py
Lines 187 to 193 in 302039a
Part of #28776.