distutils: clean up imports (found by running pyflakes)

23 files changed, 15 insertions, 63 deletions

diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py
index 02e88a204..973f21d1a 100644
--- a/numpy/distutils/command/build_clib.py
+++ b/numpy/distutils/command/build_clib.py
@@ -2,8 +2,10 @@
 """
 
 import os
+from glob import glob
 from distutils.command.build_clib import build_clib as old_build_clib
-from distutils.errors import DistutilsSetupError, DistutilsError
+from distutils.errors import DistutilsSetupError, DistutilsError, \
+     DistutilsFileError
 
 from numpy.distutils import log
 from distutils.dep_util import newer_group
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py
index 926f92a1a..9b4e81db0 100644
--- a/numpy/distutils/command/build_src.py
+++ b/numpy/distutils/command/build_src.py
@@ -11,7 +11,7 @@ from distutils.util import get_platform
 from distutils.errors import DistutilsError, DistutilsSetupError
 
 try:
-    from Pyrex.Compiler import Main
+    import Pyrex.Compiler
     have_pyrex = True
 except ImportError:
     have_pyrex = False
@@ -384,11 +384,11 @@ class build_src(build_ext.build_ext):
                     if have_pyrex:
                         log.info("pyrexc:> %s" % (target_file))
                         self.mkpath(target_dir)
-                        from Pyrex.Compiler import Main
-                        options = Main.CompilationOptions(
-                            defaults=Main.default_options,
+                        options = Pyrex.Compiler.Main.CompilationOptions(
+                            defaults=Pyrex.Compiler.Main.default_options,
                             output_file=target_file)
-                        pyrex_result = Main.compile(source, options=options)
+                        pyrex_result = Pyrex.Compiler.Main.compile(source,
+                                            options=options)
                         if pyrex_result.num_errors != 0:
                             raise DistutilsError,"%d errors while compiling %r with Pyrex" \
                                   % (pyrex_result.num_errors, source)
diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py
index af99dbd32..e7fee94df 100644
--- a/numpy/distutils/command/config_compiler.py
+++ b/numpy/distutils/command/config_compiler.py
@@ -1,4 +1,3 @@
-import sys
 from distutils.core import Command
 from numpy.distutils import log
 
diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py
index 029dadecf..51ac1a611 100644
--- a/numpy/distutils/exec_command.py
+++ b/numpy/distutils/exec_command.py
@@ -49,7 +49,6 @@ Known bugs:
 __all__ = ['exec_command','find_executable']
 
 import os
-import re
 import sys
 import tempfile
 
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py
index 579cbc08f..7fb7a8b64 100644
--- a/numpy/distutils/fcompiler/__init__.py
+++ b/numpy/distutils/fcompiler/__init__.py
@@ -18,13 +18,13 @@ except NameError:
 
 from distutils.sysconfig import get_config_var, get_python_lib
 from distutils.fancy_getopt import FancyGetopt
-from distutils.errors import DistutilsModuleError,DistutilsArgError,\
-     DistutilsExecError,CompileError,LinkError,DistutilsPlatformError
+from distutils.errors import DistutilsModuleError, \
+     DistutilsExecError, CompileError, LinkError, DistutilsPlatformError
 from distutils.util import split_quoted
 
 from numpy.distutils.ccompiler import CCompiler, gen_lib_options
 from numpy.distutils import log
-from numpy.distutils.misc_util import is_string, is_sequence
+from numpy.distutils.misc_util import is_string
 from numpy.distutils.environment import EnvironmentConfig
 from numpy.distutils.exec_command import find_executable
 from distutils.spawn import _nt_quote_args
@@ -706,7 +706,7 @@ def _find_existing_fcompiler(compiler_types,
                 new_compiler = c.suggested_f90_compiler
                 if new_compiler:
                     log.warn('Trying %r compiler as suggested by %r '
-                             'compiler for f90 support.' % (compiler,
+                             'compiler for f90 support.' % (compiler_type,
                                                             new_compiler))
                     c = new_fcompiler(plat=platform, compiler=new_compiler)
                     c.customize(dist)
@@ -811,7 +811,6 @@ def show_fcompilers(dist=None):
             log.debug("show_fcompilers: %s not found" % (compiler,))
             log.debug(repr(e))
 
-
         if v is None:
             compilers_na.append(("fcompiler="+compiler, None,
                               fcompiler_class[compiler][2]))
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py
index 3360c7309..cd13fd36e 100644
--- a/numpy/distutils/fcompiler/absoft.py
+++ b/numpy/distutils/fcompiler/absoft.py
@@ -7,7 +7,6 @@
 #   generated extension modules (works for f2py v2.45.241_1936 and up)
 
 import os
-import sys
 
 from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file
diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py
index 03c8c88ac..b57f05192 100644
--- a/numpy/distutils/fcompiler/compaq.py
+++ b/numpy/distutils/fcompiler/compaq.py
@@ -4,7 +4,6 @@
 import os
 import sys
 
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['CompaqFCompiler']
diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py
index 7871decb5..6a3545582 100644
--- a/numpy/distutils/fcompiler/g95.py
+++ b/numpy/distutils/fcompiler/g95.py
@@ -1,9 +1,5 @@
 # http://g95.sourceforge.net/
 
-import os
-import sys
-
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['G95FCompiler']
@@ -43,8 +39,6 @@ class G95FCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from numpy.distutils.fcompiler import new_fcompiler
-    #compiler = new_fcompiler(compiler='g95')
     compiler = G95FCompiler()
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
index 1a69aba17..14bfd7c40 100644
--- a/numpy/distutils/fcompiler/gnu.py
+++ b/numpy/distutils/fcompiler/gnu.py
@@ -6,7 +6,7 @@ import warnings
 from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 from numpy.distutils.exec_command import exec_command
-from numpy.distutils.misc_util import mingw32, msvc_runtime_library
+from numpy.distutils.misc_util import msvc_runtime_library
 
 compilers = ['GnuFCompiler', 'Gnu95FCompiler']
 
@@ -320,8 +320,6 @@ class Gnu95FCompiler(GnuFCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from numpy.distutils.fcompiler import new_fcompiler
-    #compiler = new_fcompiler(compiler='gnu')
     compiler = GnuFCompiler()
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py
index 431583600..7fe145f03 100644
--- a/numpy/distutils/fcompiler/hpux.py
+++ b/numpy/distutils/fcompiler/hpux.py
@@ -1,7 +1,3 @@
-import os
-import sys
-
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['HPUXFCompiler']
diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py
index a06618668..4694ad73f 100644
--- a/numpy/distutils/fcompiler/ibm.py
+++ b/numpy/distutils/fcompiler/ibm.py
@@ -5,7 +5,6 @@ import sys
 from numpy.distutils.fcompiler import FCompiler
 from numpy.distutils.exec_command import exec_command, find_executable
 from distutils import log
-from distutils.sysconfig import get_python_lib
 
 compilers = ['IBMFCompiler']
 
@@ -91,10 +90,7 @@ class IBMFCompiler(FCompiler):
         return ['-O5']
 
 if __name__ == '__main__':
-    from distutils import log
     log.set_verbosity(2)
-    from numpy.distutils.fcompiler import new_fcompiler
-    #compiler = new_fcompiler(compiler='ibm')
-    compiler = IbmFCompiler()
+    compiler = IBMFCompiler()
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
index 6256dd953..4244c5505 100644
--- a/numpy/distutils/fcompiler/intel.py
+++ b/numpy/distutils/fcompiler/intel.py
@@ -3,9 +3,6 @@
 # of intele
 # http://developer.intel.com/software/products/compilers/flin/
 
-import os
-import sys
-
 from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.ccompiler import simple_version_match
 from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file
diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py
index 2fef4a212..68e56ddbb 100644
--- a/numpy/distutils/fcompiler/lahey.py
+++ b/numpy/distutils/fcompiler/lahey.py
@@ -1,7 +1,5 @@
 import os
-import sys
 
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['LaheyFCompiler']
diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py
index 4079c6e59..ce5f7f439 100644
--- a/numpy/distutils/fcompiler/mips.py
+++ b/numpy/distutils/fcompiler/mips.py
@@ -1,6 +1,3 @@
-import os
-import sys
-
 from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py
index 328e4074f..478fb7563 100644
--- a/numpy/distutils/fcompiler/nag.py
+++ b/numpy/distutils/fcompiler/nag.py
@@ -1,7 +1,4 @@
-import os
 import sys
-
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['NAGFCompiler']
diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py
index e80613883..bf3d3b167 100644
--- a/numpy/distutils/fcompiler/none.py
+++ b/numpy/distutils/fcompiler/none.py
@@ -25,7 +25,6 @@ class NoneFCompiler(FCompiler):
 if __name__ == '__main__':
     from distutils import log
     log.set_verbosity(2)
-    from numpy.distutils.fcompiler import new_fcompiler
     compiler = NoneFCompiler()
     compiler.customize()
     print compiler.get_version()
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py
index 9152bab15..8ce77abc0 100644
--- a/numpy/distutils/fcompiler/pg.py
+++ b/numpy/distutils/fcompiler/pg.py
@@ -1,10 +1,6 @@
 
 # http://www.pgroup.com
 
-import os
-import sys
-
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler import FCompiler
 
 compilers = ['PGroupFCompiler']
diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py
index 0ff051453..20fda0e99 100644
--- a/numpy/distutils/fcompiler/sun.py
+++ b/numpy/distutils/fcompiler/sun.py
@@ -1,7 +1,3 @@
-import os
-import sys
-
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.ccompiler import simple_version_match
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py
index f5582c66b..1b4f05dbf 100644
--- a/numpy/distutils/fcompiler/vast.py
+++ b/numpy/distutils/fcompiler/vast.py
@@ -1,7 +1,5 @@
 import os
-import sys
 
-from numpy.distutils.cpuinfo import cpu
 from numpy.distutils.fcompiler.gnu import GnuFCompiler
 
 compilers = ['VastFCompiler']
diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py
index ff95ca9e5..e03c5beba 100644
--- a/numpy/distutils/intelccompiler.py
+++ b/numpy/distutils/intelccompiler.py
@@ -1,5 +1,4 @@
 
-import os
 from distutils.unixccompiler import UnixCCompiler
 from numpy.distutils.exec_command import find_executable
 
diff --git a/numpy/distutils/lib2def.py b/numpy/distutils/lib2def.py
index c42530931..583f244c0 100644
--- a/numpy/distutils/lib2def.py
+++ b/numpy/distutils/lib2def.py
@@ -1,7 +1,6 @@
 import re
 import sys
 import os
-import string
 
 __doc__ = """This module generates a DEF file from the symbols in
 an MSVC-compiled DLL import library.  It correctly discriminates between
@@ -21,8 +20,6 @@ Last Update: April 30, 1999
 
 __version__ = '0.1a'
 
-import sys
-
 py_ver = "%d%d" % tuple(sys.version_info[:2])
 
 DEFAULT_NM = 'nm -Cs'
diff --git a/numpy/distutils/line_endings.py b/numpy/distutils/line_endings.py
index 65fe2d129..4e6c1f38e 100644
--- a/numpy/distutils/line_endings.py
+++ b/numpy/distutils/line_endings.py
@@ -71,5 +71,4 @@ def unix2dos_dir(dir_name):
     return modified_files
 
 if __name__ == "__main__":
-    import sys
     dos2unix_dir(sys.argv[1])
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
index c205a3da6..cc3154114 100644
--- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py
@@ -3,13 +3,11 @@ unixccompiler - can handle very long argument lists for ar.
 """
 
 import os
-import sys
 import new
 
-from distutils.errors import DistutilsExecError, LinkError, CompileError
+from distutils.errors import DistutilsExecError, CompileError
 from distutils.unixccompiler import *
 
-
 import log
 
 # Note that UnixCCompiler._compile appeared in Python 2.3