aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-18 15:01:44 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-06-18 15:01:44 -0500
commitb0abfb1c076baced9bf182a357dd47e9482bf065 (patch)
tree55a30c8bdd916583a818895c0b660f73815202d0 /setup.py
parentc04abca662dcbffd00d928e06fbf32b9f49f8e57 (diff)
parent3c86c861ab9665df0e502f250a7471d09240e413 (diff)
downloadexternal_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.tar.gz
external_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.tar.bz2
external_python_setuptools-b0abfb1c076baced9bf182a357dd47e9482bf065.zip
Merge Python 3 native support from distribute
--HG-- rename : tests/test_distribute_setup.py => tests/test_ez_setup.py
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 1260b172..7ed396d0 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
@@ -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)