Patchwork D2724: httppeer: alias url as urlmod

login
register
mail settings
Submitter phabricator
Date March 8, 2018, 5:31 a.m.
Message ID <differential-rev-PHID-DREV-3hwty3yvwduxtweyluk5-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/29117/
State Superseded
Headers show

Comments

phabricator - March 8, 2018, 5:31 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  "url" is a common variable name. We do this aliasing elsewhere to
  avoid shadowing.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/httppeer.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -22,7 +22,7 @@ 
     httpconnection,
     pycompat,
     statichttprepo,
-    url,
+    url as urlmod,
     util,
     wireproto,
 )
@@ -149,7 +149,7 @@ 
         self._ui = ui
         ui.debug('using %s\n' % self._url)
 
-        self._urlopener = url.opener(ui, authinfo)
+        self._urlopener = urlmod.opener(ui, authinfo)
 
     def __del__(self):
         urlopener = getattr(self, '_urlopener', None)
@@ -484,7 +484,7 @@ 
     if create:
         raise error.Abort(_('cannot create new http repository'))
     try:
-        if path.startswith('https:') and not url.has_https:
+        if path.startswith('https:') and not urlmod.has_https:
             raise error.Abort(_('Python support for SSL and HTTPS '
                                 'is not installed'))