diff options
| -rw-r--r-- | CHANGES.rst | 3 | ||||
| -rw-r--r-- | setuptools/monkey.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 0e47fe06..c6d5556f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ v34.3.0 * #941: In the upload command, if the username is blank, default to ``getpass.getuser()``. +* #971: Correct distutils findall monkeypatch to match + appropriate versions (namely Python 3.4.6). + v34.2.0 ------- diff --git a/setuptools/monkey.py b/setuptools/monkey.py index 5843c46b..da6ecfe7 100644 --- a/setuptools/monkey.py +++ b/setuptools/monkey.py @@ -52,13 +52,7 @@ def patch_all(): # we can't patch distutils.cmd, alas distutils.core.Command = setuptools.Command - has_issue_12885 = ( - sys.version_info < (3, 4, 6) - or - (3, 5) < sys.version_info <= (3, 5, 3) - or - (3, 6) < sys.version_info - ) + has_issue_12885 = sys.version_info <= (3, 5, 3) if has_issue_12885: # fix findall bug in distutils (http://bugs.python.org/issue12885) |