diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-09-06 09:34:32 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-09-06 09:34:32 -0400 |
| commit | 7c6fcc08e5960234e99ba2e764766b5a0358038c (patch) | |
| tree | d992536a7ec67e070dab50df421726c4db63b9c3 /setuptools/compat.py | |
| parent | bb6bcc421feb339c8cb876edc1f3eb18159aa6a0 (diff) | |
| parent | 705e6255fca83f5ff2b194e6529968017cefaaa3 (diff) | |
| download | external_python_setuptools-7c6fcc08e5960234e99ba2e764766b5a0358038c.tar.gz external_python_setuptools-7c6fcc08e5960234e99ba2e764766b5a0358038c.tar.bz2 external_python_setuptools-7c6fcc08e5960234e99ba2e764766b5a0358038c.zip | |
Merge
Diffstat (limited to 'setuptools/compat.py')
| -rw-r--r-- | setuptools/compat.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/compat.py b/setuptools/compat.py index 3a961c0e..860c39f3 100644 --- a/setuptools/compat.py +++ b/setuptools/compat.py @@ -26,7 +26,7 @@ if sys.version_info[0] < 3: reduce = reduce unichr = unichr unicode = unicode - from urllib import url2pathname + from urllib import url2pathname, splittag import urllib2 from urllib2 import urlopen, HTTPError, URLError, unquote, splituser from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit @@ -74,7 +74,7 @@ else: from urllib.request import urlopen, url2pathname from urllib.parse import ( urlparse, urlunparse, unquote, splituser, urljoin, urlsplit, - urlunsplit, + urlunsplit, splittag, ) xrange = range filterfalse = itertools.filterfalse |