diff options
Diffstat (limited to 'setuptools')
-rw-r--r-- | setuptools/py26compat.py | 20 | ||||
-rw-r--r-- | setuptools/py27compat.py | 12 | ||||
-rw-r--r-- | setuptools/tests/py26compat.py | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py index e52bd85b..40cbb88e 100644 --- a/setuptools/py26compat.py +++ b/setuptools/py26compat.py @@ -5,18 +5,18 @@ Compatibility Support for Python 2.6 and earlier import sys try: - from urllib.parse import splittag + from urllib.parse import splittag except ImportError: - from urllib import splittag + from urllib import splittag def strip_fragment(url): - """ - In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and - later was patched to disregard the fragment when making URL requests. - Do the same for Python 2.6 and earlier. - """ - url, fragment = splittag(url) - return url + """ + In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and + later was patched to disregard the fragment when making URL requests. + Do the same for Python 2.6 and earlier. + """ + url, fragment = splittag(url) + return url if sys.version_info >= (2,7): - strip_fragment = lambda x: x + strip_fragment = lambda x: x diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py index 9d2886db..702f7d65 100644 --- a/setuptools/py27compat.py +++ b/setuptools/py27compat.py @@ -5,11 +5,11 @@ Compatibility Support for Python 2.7 and earlier import sys def get_all_headers(message, key): - """ - Given an HTTPMessage, return all headers matching a given key. - """ - return message.get_all(key) + """ + Given an HTTPMessage, return all headers matching a given key. + """ + return message.get_all(key) if sys.version_info < (3,): - def get_all_headers(message, key): - return message.getheaders(key) + def get_all_headers(message, key): + return message.getheaders(key) diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py index c5680881..7211f275 100644 --- a/setuptools/tests/py26compat.py +++ b/setuptools/tests/py26compat.py @@ -3,10 +3,10 @@ import tarfile import contextlib def _tarfile_open_ex(*args, **kwargs): - """ - Extend result as a context manager. - """ - return contextlib.closing(tarfile.open(*args, **kwargs)) + """ + Extend result as a context manager. + """ + return contextlib.closing(tarfile.open(*args, **kwargs)) if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2): tarfile_open = _tarfile_open_ex |