Mercurial > hg
diff hgext/convert/subversion.py @ 28883:032c4c2f802a
pycompat: switch to util.urlreq/util.urlerr for py3 compat
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 06 Apr 2016 23:22:12 +0000 |
parents | 86db5cb55d46 |
children | a0939666b836 |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Thu Apr 07 00:05:48 2016 +0000 +++ b/hgext/convert/subversion.py Wed Apr 06 23:22:12 2016 +0000 @@ -8,8 +8,6 @@ import re import sys import tempfile -import urllib -import urllib2 import xml.dom.minidom from mercurial import ( @@ -25,6 +23,8 @@ stringio = util.stringio propertycache = util.propertycache +urlerr = util.urlerr +urlreq = util.urlreq commandline = common.commandline commit = common.commit @@ -94,7 +94,7 @@ # so we can extend it safely with new components. The "safe" # characters were taken from the "svn_uri__char_validity" table in # libsvn_subr/path.c. - return urllib.quote(s, "!$&'()*+,-./:=@_~") + return urlreq.quote(s, "!$&'()*+,-./:=@_~") def geturl(path): try: @@ -233,10 +233,10 @@ # for the svn-specific "not found" XML. def httpcheck(ui, path, proto): try: - opener = urllib2.build_opener() + opener = urlreq.buildopener() rsp = opener.open('%s://%s/!svn/ver/0/.svn' % (proto, path)) data = rsp.read() - except urllib2.HTTPError as inst: + except urlerr.httperror as inst: if inst.code != 404: # Except for 404 we cannot know for sure this is not an svn repo ui.warn(_('svn: cannot probe remote repository, assume it could ' @@ -245,7 +245,7 @@ return True data = inst.fp.read() except Exception: - # Could be urllib2.URLError if the URL is invalid or anything else. + # Could be urlerr.urlerror if the URL is invalid or anything else. return False return '<m:human-readable errcode="160013">' in data @@ -260,7 +260,7 @@ if (os.name == 'nt' and path[:1] == '/' and path[1:2].isalpha() and path[2:6].lower() == '%3a/'): path = path[:2] + ':/' + path[6:] - path = urllib.url2pathname(path) + path = urlreq.url2pathname(path) except ValueError: proto = 'file' path = os.path.abspath(url) @@ -330,7 +330,7 @@ self.baseurl = svn.ra.get_repos_root(self.ra) # Module is either empty or a repository path starting with # a slash and not ending with a slash. - self.module = urllib.unquote(self.url[len(self.baseurl):]) + self.module = urlreq.unquote(self.url[len(self.baseurl):]) self.prevmodule = None self.rootmodule = self.module self.commits = {}