python-nose/trunk/python-nose-no-use_2to3.patch

   1 diff --git a/setup.py b/setup.py
   2 index a2091c0..7e01bba 100644
   3 --- a/setup.py
   4 +++ b/setup.py
   5 @@ -13,8 +13,7 @@ if sys.version_info >= (3,):
   6          from distribute_setup import use_setuptools
   7          use_setuptools()
   8
   9 -    extra = {'use_2to3': True,
  10 -             'test_dirs': test_dirs,
  11 +    extra = {'test_dirs': test_dirs,
  12               'test_build_dir': 'build/tests',
  13               'pyversion_patching': True,
  14               }
  15 diff --git a/setup3lib.py b/setup3lib.py
  16 index 27bdb93..761b74f 100644
  17 --- a/setup3lib.py
  18 +++ b/setup3lib.py
  19 @@ -18,7 +18,6 @@ else:
  20      import logging
  21      from setuptools import Distribution as _Distribution
  22      from distutils.core import Command
  23 -    from setuptools.command.build_py import Mixin2to3
  24      from distutils import dir_util, file_util, log
  25      import setuptools.command.test
  26      from pkg_resources import normalize_path
  27 @@ -68,7 +67,7 @@ else:
  28              self.pyversion_patching = False
  29              _Distribution.__init__(self, attrs)
  30
  31 -    class BuildTestsCommand (Command, Mixin2to3):
  32 +    class BuildTestsCommand (Command):
  33          # Create mirror copy of tests, convert all .py files using 2to3
  34          user_options = []
  35
  36 @@ -83,7 +82,6 @@ else:
  37              self.test_base = test_base
  38
  39          def run(self):
  40 -            use_2to3 = getattr(self.distribution, 'use_2to3', False)
  41              test_dirs = getattr(self.distribution, 'test_dirs', [])
  42              test_base = self.test_base
  43              bpy_cmd = self.get_finalized_command("build_py")
  44 @@ -112,9 +110,6 @@ else:
  45                              if fn.endswith(ext):
  46                                  doc_modified.append(dstfile)
  47                                  break
  48 -            if use_2to3:
  49 -                self.run_2to3(py_modified)
  50 -                self.run_2to3(doc_modified, True)
  51              if self.distribution.pyversion_patching:
  52                  if patch is not None:
  53                      for file in modified: