diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 06:17:58 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 06:17:58 -0500 |
| commit | 727a101b0a76bd93c35b41352b2a52ca261a8cf7 (patch) | |
| tree | 1b9d9ed384baf9b18c9b602f286a1dad3cd836ae /setuptools/compat.py | |
| parent | 4e2c005f8702ed7e2bce31425748eb83f3e9db0f (diff) | |
| parent | af3e8f78ae796b4e517547608a6cafaa835c430f (diff) | |
| download | external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.tar.gz external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.tar.bz2 external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.zip | |
Merge with 1.4.2
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 8af8aa74..7b824ba2 100644 --- a/setuptools/compat.py +++ b/setuptools/compat.py @@ -26,7 +26,7 @@ if sys.version_info[0] < 3: unichr = unichr unicode = unicode bytes = str - from urllib import url2pathname, splittag + from urllib import url2pathname, splittag, pathname2url import urllib2 from urllib2 import urlopen, HTTPError, URLError, unquote, splituser from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit @@ -58,7 +58,7 @@ else: bytes = bytes from urllib.error import HTTPError, URLError import urllib.request as urllib2 - from urllib.request import urlopen, url2pathname + from urllib.request import urlopen, url2pathname, pathname2url from urllib.parse import ( urlparse, urlunparse, unquote, splituser, urljoin, urlsplit, urlunsplit, splittag, |