RF - add doctest conversion to 2to3

Author: matthew-brett

nisext/py3builder.py

@@ -0,0 +1,38 @@
+""" distutils utilities for porting to python 3 within 2-compatible tree """
+
+try:
+    from distutils.command.build_py import build_py_2to3
+except ImportError:
+    # 2.x - no parsing of code
+    from distutils.command.build_py import build_py
+else: # Python 3
+    # Command to also apply 2to3 to doctests
+    from distutils import log
+    class build_py(build_py_2to3):
+        def run_2to3(self, files):
+            # Add doctest parsing; this stuff copied from distutils.utils in
+            # python 3.2 source
+            if not files:
+                return
+            fixer_names, options, explicit = (self.fixer_names,
+                                              self.options,
+                                              self.explicit)
+            # Make this class local, to delay import of 2to3
+            from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+            class DistutilsRefactoringTool(RefactoringTool):
+                def log_error(self, msg, *args, **kw):
+                    log.error(msg, *args)
+
+                def log_message(self, msg, *args):
+                    log.info(msg, *args)
+
+                def log_debug(self, msg, *args):
+                    log.debug(msg, *args)
+
+            if fixer_names is None:
+                fixer_names = get_fixers_from_package('lib2to3.fixes')
+            r = DistutilsRefactoringTool(fixer_names, options=options)
+            r.refactor(files, write=True)
+            # Then doctests
+            r.refactor(files, write=True, doctests_only=True)
+

setup.py

@@ -17,28 +17,18 @@
 # update it when the contents of directories change.
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
-from distutils.core import setup
-
-# For some commands, use setuptools.  
+# For some commands, use setuptools.
 if len(set(('develop', 'bdist_egg', 'bdist_rpm', 'bdist', 'bdist_dumb',
             'bdist_wininst', 'install_egg_info', 'egg_info', 'easy_install',
             )).intersection(sys.argv)) > 0:
-    # setup_egg imports setuptools setup, thus monkeypatching distutils. 
-    from setup_egg import extra_setuptools_args
+    # setup_egg imports setuptools setup, thus monkeypatching distutils.
+    import setup_egg
 
-# extra_setuptools_args can be defined from the line above, but it can
-# also be defined here because setup.py has been exec'ed from
-# setup_egg.py.
-if not 'extra_setuptools_args' in globals():
-    extra_setuptools_args = dict()
+from distutils.core import setup
 
 # Python 2 to 3 build
-try:
-    from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
-    # 2.x
-    from distutils.command.build_py import build_py
-
+from nisext.py3builder import build_py
+# Commit hash writing, and dependency checking
 from nisext.sexts import get_comrec_build, package_check
 cmdclass = {'build_py': get_comrec_build('nibabel', build_py)}
 
@@ -49,11 +39,17 @@
 # Do dependency checking
 package_check('numpy', NUMPY_MIN_VERSION)
 package_check('dicom', PYDICOM_MIN_VERSION, optional=True)
+extra_setuptools_args = {}
 if 'setuptools' in sys.modules:
-    extra_setuptools_args['extras_require'] = dict(
-        doc='Sphinx>=0.3',
-        test='nose>=0.10.1',
-        nicom = 'dicom>=' + PYDICOM_MIN_VERSION)
+    extra_setuptools_args = dict(
+        tests_require=['nose'],
+        test_suite='nose.collector',
+        zip_safe=False,
+        extras_require = dict(
+            doc='Sphinx>=0.3',
+            test='nose>=0.10.1',
+            nicom = 'dicom>=' + PYDICOM_MIN_VERSION)
+    )
 
 def main(**extra_args):
     setup(name=NAME,

setup_egg.py

@@ -3,21 +3,11 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """Wrapper to run setup.py using setuptools."""
 
-from setuptools import setup 
+import setuptools
 
 ################################################################################
 # Call the setup.py script, injecting the setuptools-specific arguments.
 
-extra_setuptools_args = dict(
-                            tests_require=['nose'],
-                            test_suite='nose.collector',
-                            zip_safe=False,
-                            )
-
-
 if __name__ == '__main__':
-    execfile('setup.py', dict(__name__='__main__', 
-                          extra_setuptools_args=extra_setuptools_args))
-
-
+    exec(open('setup.py', 'rt').read(), dict(__name__='__main__'))