Patchwork D1090: httppeer: extract content-type from headers using native str

login
register
mail settings
Submitter phabricator
Date Oct. 15, 2017, 4:58 a.m.
Message ID <differential-rev-PHID-DREV-oupo6iomne4aq26cgzzl-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/24937/
State Superseded
Headers show

Comments

phabricator - Oct. 15, 2017, 4:58 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1090

AFFECTED FILES
  mercurial/httppeer.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -311,9 +311,9 @@ 
                 self.ui.warn(_('real URL is %s\n') % resp_url)
         self._url = resp_url
         try:
-            proto = resp.getheader('content-type')
+            proto = pycompat.bytesurl(resp.getheader(r'content-type', r''))
         except AttributeError:
-            proto = resp.headers.get('content-type', '')
+            proto = pycompat.bytesurl(resp.headers.get(r'content-type', r''))
 
         safeurl = util.hidepassword(self._url)
         if proto.startswith('application/hg-error'):