diff options
| -rw-r--r-- | CHANGES.txt | 14 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 479850a7..16461a21 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,12 +2,16 @@ CHANGES ======= ------------- -Next version ------------- +------ +0.6.36 +------ -- Fix for distutils scripts installation on Python 3, related to - ``__pycache__`` directories. +* Pull Request #35: In `Buildout issue 64 + <https://github.com/buildout/buildout/issues/64>`_, it was reported that + under Python 3, installation of distutils scripts could attempt to copy + the ``__pycache__`` directory as a file, causing an error, apparently only + under Windows. Easy_install now skips all directories when processing + metadata scripts. ------ 0.6.35 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index ba98fa13..98af2620 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -523,8 +523,9 @@ Please make the appropriate changes for your system and try again. if not self.exclude_scripts and dist.metadata_isdir('scripts'): for script_name in dist.metadata_listdir('scripts'): if dist.metadata_isdir('scripts/' + script_name): - # Probably Python 3 __pycache__ directory. - continue + # The "script" is a directory, likely a Python 3 + # __pycache__ directory, so skip it. + continue self.install_script( dist, script_name, dist.get_metadata('scripts/'+script_name) |