diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
| commit | 337ea160558acc352c8a61b9d27c93d1f9e09618 (patch) | |
| tree | 52272a24ccb0b3be0d2349956c5fd44e5e65e565 /setuptools/py26compat.py | |
| parent | 3bd5118eaa87b4f6598e0a473fec3623b6579d3b (diff) | |
| parent | d49c41c6ebc16371efabe0b92b417457cf9c47d7 (diff) | |
| download | python-setuptools-git-337ea160558acc352c8a61b9d27c93d1f9e09618.tar.gz | |
Merge from default.
Diffstat (limited to 'setuptools/py26compat.py')
| -rw-r--r-- | setuptools/py26compat.py | 5 |
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): """ |