aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt7
-rwxr-xr-xsetuptools/command/easy_install.py3
2 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index cae946e0..479850a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
CHANGES
=======
+------------
+Next version
+------------
+
+- Fix for distutils scripts installation on Python 3, related to
+ ``__pycache__`` directories.
+
------
0.6.35
------
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0d72f758..ba98fa13 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -522,6 +522,9 @@ Please make the appropriate changes for your system and try again.
"""Write all the scripts for `dist`, unless scripts are excluded"""
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
self.install_script(
dist, script_name,
dist.get_metadata('scripts/'+script_name)