aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt1
-rwxr-xr-xsetup.py6
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 44c62fa3..866ba7d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
-----
* Issue 74: no_fake should be True by default.
+* Issue 72: avoid a bootstrapping issue with easy_install -U
-----
0.6.6
diff --git a/setup.py b/setup.py
index aaa7f3e3..cdc28e65 100755
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,12 @@ class build_py(_build_py):
self.copy_file(srcfile, exe_target)
srcfile = os.path.abspath(srcfile)
+
+ # avoid a bootstrapping issue with easy_install -U (when the
+ # previous version doesn't have convert_2to3_doctests)
+ if not hasattr(self.distribution, 'convert_2to3_doctests'):
+ return
+
if copied and srcfile in self.distribution.convert_2to3_doctests:
self.__doctests_2to3.append(outf)