summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <julien.cristau@logilab.fr>2014-09-22 18:08:35 +0200
committerJulien Cristau <julien.cristau@logilab.fr>2014-09-22 18:08:35 +0200
commit911bd12eed4e5984f1a4aeaff63306d7300fe116 (patch)
tree06062aac7e6b126fdbe7ef8ef06830d25c257947
parent24fd6fca2f119662ea9acc9b6f787349a7912ab1 (diff)
downloadlogilab-common-911bd12eed4e5984f1a4aeaff63306d7300fe116.tar.gz
[pkg] don't run 2to3 in setup.py
We can now run directly on python3 (3.3+, and at least as far as running tests). Closes #265740
-rw-r--r--setup.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/setup.py b/setup.py
index 764651d..eed2bcc 100644
--- a/setup.py
+++ b/setup.py
@@ -38,12 +38,7 @@ except ImportError:
from distutils.command import install_lib
USE_SETUPTOOLS = 0
-try:
- # python3
- from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
- # python2.x
- from distutils.command.build_py import build_py
+from distutils.command.build_py import build_py
sys.modules.pop('__pkginfo__', None)
# import optional features
@@ -137,14 +132,6 @@ class MyBuildPy(build_py):
dest = join(basedir, directory)
shutil.rmtree(dest, ignore_errors=True)
shutil.copytree(directory, dest)
- if sys.version_info >= (3, 0):
- # process manually python file in include_dirs (test data)
- from distutils.util import run_2to3
- # brackets are NOT optional here for py3k compat
- print('running 2to3 on', dest)
- run_2to3([dest])
-
-
def install(**kwargs):