Skip to content

Commit

Permalink
remove 2to3. #1350.
Browse files Browse the repository at this point in the history
  • Loading branch information
shimizukawa committed May 1, 2014
1 parent b00d97a commit 956d628
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
9 changes: 0 additions & 9 deletions setup.py
Expand Up @@ -52,14 +52,6 @@
else: # 2.6, 2.7, 3.3 or later
requires.append('Jinja2>=2.3')

# tell distribute to use 2to3 with our own fixers
extra = {}
if sys.version_info >= (3, 0):
extra.update(
use_2to3=True,
use_2to3_fixers=['custom_fixers']
)

# Provide a "compile_catalog" command that also creates the translated
# JavaScript files if Babel is available.

Expand Down Expand Up @@ -196,5 +188,4 @@ def run(self):
},
install_requires=requires,
cmdclass=cmdclass,
**extra
)
14 changes: 3 additions & 11 deletions tests/run.py
Expand Up @@ -15,8 +15,6 @@
from os import path, chdir, listdir, environ
import shutil

from six import PY3


testroot = path.dirname(__file__) or '.'
if 'BUILD_TEST_PATH' in environ:
Expand All @@ -28,15 +26,9 @@
newroot = path.join(newroot, listdir(newroot)[0], 'tests')

shutil.rmtree(newroot, ignore_errors=True)

if PY3:
print('Copying and converting sources to build/lib/tests...')
from distutils.util import copydir_run_2to3
copydir_run_2to3(testroot, newroot)
else:
# just copying test directory to parallel testing
print('Copying sources to build/lib/tests...')
shutil.copytree(testroot, newroot)
# just copying test directory to parallel testing
print('Copying sources to build/lib/tests...')
shutil.copytree(testroot, newroot)

# always test the sphinx package from build/lib/
sys.path.insert(0, path.abspath(path.join(newroot, path.pardir)))
Expand Down

0 comments on commit 956d628

Please sign in to comment.