[PATCH 6 of 9] py3: convert url to str using pycompat.strurl()

Pulkit Goyal 7895pulkit at gmail.com
Thu Jun 15 17:34:48 EDT 2017


# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1497557909 -19800
#      Fri Jun 16 01:48:29 2017 +0530
# Node ID a7eaba4f05c56f714af870938252ebf7489845f2
# Parent  8c2bdaf9a1901676753ed57df5a99299ded8fa08
py3: convert url to str using pycompat.strurl()

The libraries dealing with opening url online and related stuffs requires url to
be passes as a str.

diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -103,6 +103,7 @@
 
         self.ui = ui
         self.ui.debug('using %s\n' % self._url)
+        self._url = pycompat.strurl(self._url)
 
         self.urlopener = url.opener(ui, authinfo)
         self.requestbuilder = urlreq.request
@@ -175,7 +176,7 @@
             else:
                 q += sorted(args.items())
         qs = '?%s' % urlreq.urlencode(q)
-        cu = "%s%s" % (self._url, qs)
+        cu = r"%s%s" % (self._url, qs)
         size = 0
         if util.safehasattr(data, 'length'):
             size = data.length


More information about the Mercurial-devel mailing list