This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3633

py3: use bytes in tests/printenv.py
ClosedPublic

Authored by pulkit on May 20 2018, 8:24 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGbacbe829c2bf: py3: use bytes in tests/printenv.py
Summary

This patch add b'' prefixes and adds some .encode() calls to convert str to
bytes on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 20 2018, 8:24 AM
indygreg accepted this revision.May 21 2018, 2:29 PM
indygreg added a subscriber: indygreg.

This one worries me a bit because environment variable values can contain non-ASCII. However, the changed code only operates on HG_ variables and I think those variables are well-sanitized and should be ASCII safe.

Also, os.environ is str/bytes on Python 2 and the .encode() is nonsensical. But Python 2 doesn't care, so meh.

Since this is testing code, the barrier for change is low. And the failure mode is pretty obvious. So I'm OK landing this now and fixing later if it causes problems.

This revision is now accepted and ready to land.May 21 2018, 2:29 PM
Closed by commit rHGbacbe829c2bf: py3: use bytes in tests/printenv.py (authored by pulkit). · Explain WhyMay 21 2018, 2:36 PM
This revision was automatically updated to reflect the committed changes.
pulkit added a comment.May 24 2018, 4:51 PM

Looks like this needs to be dropped because due to this couple of tests which were already passing failed. Link to buildbot: https://buildbot.mercurial-scm.org/builders/py3%20tests/builds/920/steps/run-tests.py%20%28python3%29/logs/stdio

Revision Contents
Changeset List

PathPackages
Mtests/printenv.py (9 lines)

Diff 8858

tests/printenv.py

out = open(sys.argv[3], "ab") out = open(sys.argv[3], "ab")
# variables with empty values may not exist on all platforms, filter # variables with empty values may not exist on all platforms, filter
# them now for portability sake. # them now for portability sake.
env = [(k, v) for k, v in os.environ.items() env = [(k, v) for k, v in os.environ.items()
if k.startswith("HG_") and v] if k.startswith("HG_") and v]
env.sort() env.sort()
out.write("%s hook: " % name) out.write(b"%s hook: " % name.encode('ascii'))
if os.name == 'nt': if os.name == 'nt':
filter = lambda x: x.replace('\\', '/') filter = lambda x: x.replace('\\', '/')
else: else:
filter = lambda x: x filter = lambda x: x
vars = ["%s=%s" % (k, filter(v)) for k, v in env] vars = [b"%s=%s" % (k.encode('ascii'), filter(v).encode('ascii'))
out.write(" ".join(vars)) for k, v in env]
out.write("\n") out.write(b" ".join(vars))
out.write(b"\n")
out.close() out.close()
sys.exit(exitcode) sys.exit(exitcode)