Mercurial > hg

changeset 39956:36e9d2c60837

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 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
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 01 Oct 2018 23:11:07 -0700
parents c421c22d3ad2
children e1e3d1b498d3
files mercurial/debugcommands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,