diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-23 16:53:15 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-23 16:53:15 -0500 |
| commit | 31cbff363a92d872f2daaaf1a24e1f9c0e47ca1f (patch) | |
| tree | b728522689df77bcf3874de3d9c082aa76d85c5b | |
| parent | 776bf48ad86c29e5b2ae8184a0c47fb25e542cc7 (diff) | |
| download | external_python_setuptools-31cbff363a92d872f2daaaf1a24e1f9c0e47ca1f.tar.gz external_python_setuptools-31cbff363a92d872f2daaaf1a24e1f9c0e47ca1f.tar.bz2 external_python_setuptools-31cbff363a92d872f2daaaf1a24e1f9c0e47ca1f.zip | |
Update version match for issue12885. Ref #971.
| -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) |