diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-05-30 19:39:58 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-05-30 19:39:58 -0400 |
| commit | fcdf12ee7fdf43c9dded5b68232a0fb3376d4858 (patch) | |
| tree | 29baaad1490dcce705ccc5f32c6d9d9240e1d10d /setuptools/py27compat.py | |
| parent | 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (diff) | |
| parent | 4dc2c76b62a5071dfacf434555dfa8ec2be0b433 (diff) | |
| download | external_python_setuptools-fcdf12ee7fdf43c9dded5b68232a0fb3376d4858.tar.gz external_python_setuptools-fcdf12ee7fdf43c9dded5b68232a0fb3376d4858.tar.bz2 external_python_setuptools-fcdf12ee7fdf43c9dded5b68232a0fb3376d4858.zip | |
Merge branch 'master' into feature/re-vendor-sadface
Diffstat (limited to 'setuptools/py27compat.py')
| -rw-r--r-- | setuptools/py27compat.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py index f0a80a8e..701283c8 100644 --- a/setuptools/py27compat.py +++ b/setuptools/py27compat.py @@ -2,9 +2,10 @@ Compatibility Support for Python 2.7 and earlier """ -import sys import platform +import six + def get_all_headers(message, key): """ @@ -13,15 +14,14 @@ def get_all_headers(message, key): return message.get_all(key) -if sys.version_info < (3,): - +if six.PY2: def get_all_headers(message, key): return message.getheaders(key) linux_py2_ascii = ( - platform.system() == 'Linux' and - sys.version_info < (3,) + platform.system() == 'Linux' and + six.PY2 ) rmtree_safe = str if linux_py2_ascii else lambda x: x |