Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use system strings for HTTP response header comparison
authorGregory Szorc <gregory.szorc@gmail.com>
Mon, 01 Oct 2018 23:11:07 -0700
changeset 39956 36e9d2c60837
parent 39955 c421c22d3ad2
child 39957 e1e3d1b498d3
py3: use system strings for HTTP response header comparison 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. Differential Revision: https://phab.mercurial-scm.org/D4835
mercurial/debugcommands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/debugcommands.py	Mon Oct 01 23:08:04 2018 -0700
+++ b/mercurial/debugcommands.py	Mon Oct 01 23:11:07 2018 -0700
@@ -3324,7 +3324,8 @@
                 getattr(e, 'read', lambda: None)()
                 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') %
                          stringutil.pprint(cborutil.decodeall(body)[0],
                                            bprefix=True,
Mercurial