Mercurial > hg-stable
changeset 36965:43815d87c6aa
httppeer: alias url as urlmod
"url" is a common variable name. We do this aliasing elsewhere to
avoid shadowing.
Differential Revision: https://phab.mercurial-scm.org/D2724
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 07 Mar 2018 19:57:50 -0800 |
| parents | 644a02f6b34f |
| children | 66651ec259ea |
| files | mercurial/httppeer.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httppeer.py Wed Mar 14 11:52:35 2018 -0700 +++ b/mercurial/httppeer.py Wed Mar 07 19:57:50 2018 -0800 @@ -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'))