Patchwork D2724: httppeer: alias url as urlmod

login
register
mail settings
Submitter phabricator
Date March 15, 2018, 4:54 p.m.
Message ID <6692aeb1e3a31514632b52e6672bd401@localhost.localdomain>
Download mbox | patch
Permalink /patch/29545/
State Not Applicable
Headers show

Comments

phabricator - March 15, 2018, 4:54 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb70256e6cffa: httppeer: alias url as urlmod (authored by indygreg, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D2724?vs=6974&id=7068#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2724?vs=6974&id=7068

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

AFFECTED FILES
  mercurial/httppeer.py

CHANGE DETAILS




To: indygreg, #hg-reviewers, pulkit
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,
 )
@@ -150,7 +150,7 @@ 
         self._ui = ui
         ui.debug('using %s\n' % self._url)
 
-        self._urlopener = url.opener(ui, authinfo)
+        self._urlopener = urlmod.opener(ui, authinfo)
         self._requestbuilder = urlreq.request
 
     def __del__(self):
@@ -486,7 +486,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'))