This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4835

py3: use system strings for HTTP response header comparison
ClosedPublic

Authored by indygreg on Oct 2 2018, 2:17 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG36e9d2c60837: py3: use system strings for HTTP response header comparison
rHGdd721d8ff13b: py3: use system strings for HTTP response header comparison
Summary

res.headers is holding system strings. Attempting to compare against
bytes always fails and we fail to print decoded CBOR responses on
Python 3.

After this change, various test-wireproto* tests are now properly
printing CBOR response objects.

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

indygreg created this revision.Oct 2 2018, 2:17 AM
Closed by commit rHGdd721d8ff13b: py3: use system strings for HTTP response header comparison (authored by indygreg). · Explain WhyOct 2 2018, 8:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (3 lines)

Diff 11554

mercurial/debugcommands.py

try: try:
res = opener.open(req) res = opener.open(req)
body = res.read() body = res.read()
except util.urlerr.urlerror as e: except util.urlerr.urlerror as e:
# read() method must be called, but only exists in Python 2 # read() method must be called, but only exists in Python 2
getattr(e, 'read', lambda: None)() getattr(e, 'read', lambda: None)()
continue continue
if res.headers.get('Content-Type') == 'application/mercurial-cbor': ct = res.headers.get(r'Content-Type')
if ct == r'application/mercurial-cbor':
ui.write(_('cbor> %s\n') % ui.write(_('cbor> %s\n') %
stringutil.pprint(cborutil.decodeall(body)[0], stringutil.pprint(cborutil.decodeall(body)[0],
bprefix=True, bprefix=True,
indent=2)) indent=2))
elif action == 'close': elif action == 'close':
peer.close() peer.close()
elif action == 'readavailable': elif action == 'readavailable':