Patchwork D2498: py3: use pycompat.bytestr to convert str to bytes

login
register
mail settings
Submitter phabricator
Date Feb. 28, 2018, 10:29 p.m.
Message ID <differential-rev-PHID-DREV-7c4pjs5tqo4pd4ecg44y-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28496/
State Superseded
Headers show

Comments

phabricator - Feb. 28, 2018, 10:29 p.m.
pulkit 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/D2498

AFFECTED FILES
  mercurial/exchange.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel
phabricator - March 1, 2018, 9:37 a.m.
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.


  Perhaps util.forcebytestr() is better because URLError is a subclass of IOError.

REPOSITORY
  rHG Mercurial

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

To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -2258,6 +2258,7 @@ 
             ui.warn(_('HTTP error fetching bundle: %s\n') %
                     util.forcebytestr(e))
         except urlerr.urlerror as e:
-            ui.warn(_('error fetching bundle: %s\n') % e.reason)
+            ui.warn(_('error fetching bundle: %s\n') %
+                    pycompat.bytestr(e.reason))
 
         return False