Merge with upstream

1 files changed, 4 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 6e04bd24..221d59d7 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,8 @@ import textwrap
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 src_root = None
-if sys.version_info >= (3,):
+do_2to3 = False
+if sys.version_info >= (3,) and do_2to3:
     tmp_src = os.path.join("build", "src")
     from distutils.filelist import FileList
     from distutils import dir_util, file_util, util, log
@@ -70,7 +71,8 @@ class build_py(_build_py):
                 # previous version doesn't have convert_2to3_doctests)
                 if not hasattr(self.distribution, 'convert_2to3_doctests'):
                     continue
-
+                if not do_2to3:
+                    continue
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)