Merged bugfixes from the danielstutzbach fork

--HG--
branch : distribute
extra : rebase_source : cce25468ec8f18af01e99af60cdaaf0fb4a72ee9

1 files changed, 6 insertions, 0 deletions

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)