summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-12-06 17:53:19 -0500
committerEli Collins <elic@assurancetechnologies.com>2011-12-06 17:53:19 -0500
commit01dfa4e439db76b6991aa729672a02efcd835e77 (patch)
tree44adee11c2f51f2b52601f4e22c1fdb873ab7cfc /setup.py
parent7645cfde280b228c537d19bcb4d4aab0fdde27ef (diff)
downloadpasslib-01dfa4e439db76b6991aa729672a02efcd835e77.tar.gz
removed 2to3 translation step from setup
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py23
1 files changed, 3 insertions, 20 deletions
diff --git a/setup.py b/setup.py
index 36b55e8..6a03fcf 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ try:
except ImportError:
from distutils import setup
has_distribute = False
-
+
#=========================================================
# init setup options
#=========================================================
@@ -29,23 +29,6 @@ opts = { "cmdclass": { } }
args = sys.argv[1:]
#=========================================================
-# 2to3 translation
-#=========================================================
-if py3k:
- # monkeypatch preprocessor into lib2to3
- from passlib._setup.cond2to3 import patch2to3
- patch2to3()
-
- # enable 2to3 translation in build_py
- if has_distribute:
- opts['use_2to3'] = True
- else:
- # if we can't use distribute's "use_2to3" flag,
- # have to override build_py command
- from distutils.command.build_py import build_py_2to3 as build_py
- opts['cmdclass']['build_py'] = build_py
-
-#=========================================================
#register docdist command (not required)
#=========================================================
try:
@@ -75,7 +58,7 @@ if os.path.exists(os.path.join(root_dir, "passlib.komodoproject")):
elif not v.startswith("-"):
break
i += 1
-
+
if for_release:
assert '.dev' not in VERSION and '.post' not in VERSION
else:
@@ -91,7 +74,7 @@ if os.path.exists(os.path.join(root_dir, "passlib.komodoproject")):
# to have the correct version string
from passlib._setup.stamp import stamp_distutils_output
stamp_distutils_output(opts, VERSION)
-
+
#=========================================================
#static text
#=========================================================