aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/compat.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-07-24 23:00:24 +0200
committerJason R. Coombs <jaraco@jaraco.com>2013-07-24 23:00:24 +0200
commitfd77197ba1cc95ddfd2744ff8e9953bbf9f11def (patch)
treea0837830143828d3339b6b429e413de972ac32a8 /setuptools/compat.py
parent9a3cc1cd285136180c9b59c821a01f755ddf8874 (diff)
downloadexternal_python_setuptools-fd77197ba1cc95ddfd2744ff8e9953bbf9f11def.tar.gz
external_python_setuptools-fd77197ba1cc95ddfd2744ff8e9953bbf9f11def.tar.bz2
external_python_setuptools-fd77197ba1cc95ddfd2744ff8e9953bbf9f11def.zip
Add 'urlsplit' and 'urlunsplit' to compat module
Diffstat (limited to 'setuptools/compat.py')
-rw-r--r--setuptools/compat.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/setuptools/compat.py b/setuptools/compat.py
index e2f64de2..3a961c0e 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -29,7 +29,7 @@ if sys.version_info[0] < 3:
from urllib import url2pathname
import urllib2
from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
- from urlparse import urlparse, urlunparse, urljoin
+ from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
xrange = xrange
filterfalse = itertools.ifilterfalse
@@ -72,7 +72,10 @@ else:
from urllib.error import HTTPError, URLError
import urllib.request as urllib2
from urllib.request import urlopen, url2pathname
- from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
+ from urllib.parse import (
+ urlparse, urlunparse, unquote, splituser, urljoin, urlsplit,
+ urlunsplit,
+ )
xrange = range
filterfalse = itertools.filterfalse