reformat and clean up some old code

diff --git a/Cython/Distutils/extension.py b/Cython/Distutils/extension.py
index 7800fca..df600a8 100644 (file)
--- a/Cython/Distutils/extension.py
+++ b/Cython/Distutils/extension.py
@@ -5,7 +5,6 @@ Pyrex extension modules in setup scripts."""
 
 __revision__ = "$Id:$"
 
-import os
 import sys
 import distutils.extension as _Extension
 
@@ -19,31 +18,31 @@ class Extension(_Extension.Extension):
     # When adding arguments to this constructor, be sure to update
     # user_options.extend in build_ext.py.
     def __init__(self, name, sources,
-            include_dirs = None,
-            define_macros = None,
-            undef_macros = None,
-            library_dirs = None,
-            libraries = None,
-            runtime_library_dirs = None,
-            extra_objects = None,
-            extra_compile_args = None,
-            extra_link_args = None,
-            export_symbols = None,
-            #swig_opts = None,
-            depends = None,
-            language = None,
-            cython_include_dirs = None,
-            cython_directives = None,
-            cython_create_listing = 0,
-            cython_line_directives = 0,
-            cython_cplus = 0,
-            cython_c_in_temp = 0,
-            cython_gen_pxi = 0,
-            cython_gdb = False,
-            no_c_in_traceback = False,
-            cython_compile_time_env = None,
-            **kw):
-        
+                 include_dirs=None,
+                 define_macros=None,
+                 undef_macros=None,
+                 library_dirs=None,
+                 libraries=None,
+                 runtime_library_dirs=None,
+                 extra_objects=None,
+                 extra_compile_args=None,
+                 extra_link_args=None,
+                 export_symbols=None,
+                 #swig_opts=None,
+                 depends=None,
+                 language=None,
+                 cython_include_dirs=None,
+                 cython_directives=None,
+                 cython_create_listing=False,
+                 cython_line_directives=False,
+                 cython_cplus=False,
+                 cython_c_in_temp=False,
+                 cython_gen_pxi=False,
+                 cython_gdb=False,
+                 no_c_in_traceback=False,
+                 cython_compile_time_env=None,
+                 **kw):
+
         # Translate pyrex_X to cython_X for backwards compatibility.
         had_pyrex_options = False
         for key in kw.keys():
@@ -51,38 +50,40 @@ class Extension(_Extension.Extension):
                 had_pyrex_options = True
                 kw['cython' + key[5:]] = kw.pop(key)
         if had_pyrex_options:
-            Extension.__init__(self, name, sources,
-                include_dirs = include_dirs,
-                define_macros = define_macros,
-                undef_macros = undef_macros,
-                library_dirs = library_dirs,
-                libraries = libraries,
-                runtime_library_dirs = runtime_library_dirs,
-                extra_objects = extra_objects,
-                extra_compile_args = extra_compile_args,
-                extra_link_args = extra_link_args,
-                export_symbols = export_symbols,
-                #swig_opts = swig_opts,
-                depends = depends,
-                language = language,
-                no_c_in_traceback = no_c_in_traceback,
+            Extension.__init__(
+                self, name, sources,
+                include_dirs=include_dirs,
+                define_macros=define_macros,
+                undef_macros=undef_macros,
+                library_dirs=library_dirs,
+                libraries=libraries,
+                runtime_library_dirs=runtime_library_dirs,
+                extra_objects=extra_objects,
+                extra_compile_args=extra_compile_args,
+                extra_link_args=extra_link_args,
+                export_symbols=export_symbols,
+                #swig_opts=swig_opts,
+                depends=depends,
+                language=language,
+                no_c_in_traceback=no_c_in_traceback,
                 **kw)
             return
 
-        _Extension.Extension.__init__(self, name, sources,
-            include_dirs = include_dirs,
-            define_macros = define_macros,
-            undef_macros = undef_macros,
-            library_dirs = library_dirs,
-            libraries = libraries,
-            runtime_library_dirs = runtime_library_dirs,
-            extra_objects = extra_objects,
-            extra_compile_args = extra_compile_args,
-            extra_link_args = extra_link_args,
-            export_symbols = export_symbols,
-            #swig_opts = swig_opts,
-            depends = depends,
-            language = language,
+        _Extension.Extension.__init__(
+            self, name, sources,
+            include_dirs=include_dirs,
+            define_macros=define_macros,
+            undef_macros=undef_macros,
+            library_dirs=library_dirs,
+            libraries=libraries,
+            runtime_library_dirs=runtime_library_dirs,
+            extra_objects=extra_objects,
+            extra_compile_args=extra_compile_args,
+            extra_link_args=extra_link_args,
+            export_symbols=export_symbols,
+            #swig_opts=swig_opts,
+            depends=depends,
+            language=language,
             **kw)
 
         self.cython_include_dirs = cython_include_dirs or []
@@ -98,8 +99,10 @@ class Extension(_Extension.Extension):
 
 # class Extension
 
+read_setup_file = _Extension.read_setup_file
+
 
-# reuse and extend original docstring from base class
+# reuse and extend original docstring from base class (if we can)
 if sys.version_info[0] < 3 and _Extension.Extension.__doc__:
     # -OO discards docstrings
     Extension.__doc__ = _Extension.Extension.__doc__ + """\
@@ -123,5 +126,3 @@ if sys.version_info[0] < 3 and _Extension.Extension.__doc__:
     no_c_in_traceback : boolean
         emit the c file and line number from the traceback for exceptions
 """
-
-read_setup_file = _Extension.read_setup_file