diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-01 22:28:51 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-01 22:28:51 -0400 |
| commit | 1bab356fbc59272d9e17f03e52930cd4574ffa0a (patch) | |
| tree | 8f7eca06be2bcc198cf6ee911ebcbc9593e81e54 /setuptools/__init__.py | |
| parent | 336258f31655704751d1d0d0b9381d5b4e55b659 (diff) | |
| download | external_python_setuptools-1bab356fbc59272d9e17f03e52930cd4574ffa0a.tar.gz external_python_setuptools-1bab356fbc59272d9e17f03e52930cd4574ffa0a.tar.bz2 external_python_setuptools-1bab356fbc59272d9e17f03e52930cd4574ffa0a.zip | |
Only apply findall patch on affected Pythons.
Diffstat (limited to 'setuptools/__init__.py')
| -rw-r--r-- | setuptools/__init__.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index cf0c39f2..42703947 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -1,6 +1,7 @@ """Extensions to the 'distutils' for large or complex distributions""" import os +import sys import functools import distutils.core import distutils.filelist @@ -17,7 +18,7 @@ from setuptools.depends import Require __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', - 'find_packages' + 'find_packages', ] __version__ = setuptools.version.__version__ @@ -171,5 +172,14 @@ def findall(dir=os.curdir): return list(files) -# fix findall bug in distutils (http://bugs.python.org/issue12885) -distutils.filelist.findall = findall +has_issue_12885 = ( + sys.version_info < (3, 4, 6) + or + (3, 5) < sys.version_info <= (3, 5, 3) + or + (3, 6) < sys.version_info +) + +if has_issue_12885: + # fix findall bug in distutils (http://bugs.python.org/issue12885) + distutils.filelist.findall = findall |