aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/compat.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-12-01 06:08:30 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-12-01 06:08:30 -0500
commit4ae4faeb1262435260ee8a5f2a0ab910fe96ea23 (patch)
treeea69a2b8a86eaba4ba9d5000228e5ff78c92477b /setuptools/compat.py
parenta87729f8b64b95cc203ae8e71fc6b5150725e1e7 (diff)
downloadexternal_python_setuptools-4ae4faeb1262435260ee8a5f2a0ab910fe96ea23.tar.gz
external_python_setuptools-4ae4faeb1262435260ee8a5f2a0ab910fe96ea23.tar.bz2
external_python_setuptools-4ae4faeb1262435260ee8a5f2a0ab910fe96ea23.zip
Moved imports to the top, made them compatible with Python 2, and added a docstring.
Diffstat (limited to 'setuptools/compat.py')
-rw-r--r--setuptools/compat.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/compat.py b/setuptools/compat.py
index bbc98d66..9a191465 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -27,7 +27,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
@@ -73,7 +73,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,