Merge 0.7.3 release0.8b1

1 files changed, 5 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index ece0370e..8afdf235 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@ import re
 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
@@ -46,7 +47,7 @@ exec(init_file.read(), d)
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.4"
+VERSION = "0.8"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
@@ -75,7 +76,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)