summaryrefslogtreecommitdiff
path: root/setuptools/py26compat.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
commitd9184f7b8f0b9405f68ea45dbd574aad6a08666d (patch)
treee93b4d6ca527f8b22c4a11b978864f61ebe02405 /setuptools/py26compat.py
parent6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 (diff)
parentb639cf0fa905f6fda3879c991197b759aaa20091 (diff)
downloadpython-setuptools-git-19.3b1.tar.gz
Merge feature/issue-22919.3b1
Diffstat (limited to 'setuptools/py26compat.py')
-rw-r--r--setuptools/py26compat.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 738b0cc4..e52bd85b 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -4,7 +4,10 @@ Compatibility Support for Python 2.6 and earlier
import sys
-from setuptools.compat import splittag
+try:
+ from urllib.parse import splittag
+except ImportError:
+ from urllib import splittag
def strip_fragment(url):
"""