STY: PEP8 and pyflakes fixes for numpy/distutils.

10 files changed, 40 insertions, 36 deletions

diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
index 5252db283..0e5bab925 100644
--- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
+++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_array_equal
 from f2py_ext import fib2
 
 class TestFib2(TestCase):
diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
index 9653b9023..499b9ebc3 100644
--- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
+++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_equal
 from f2py_f90_ext import foo
 
 class TestFoo(TestCase):
diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
index 5fd9be439..e02ca8103 100644
--- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py
+++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
@@ -1,8 +1,7 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
 from gen_ext import fib3
+from numpy.testing import TestCase, run_module_suite, assert_array_equal
 
 class TestFib3(TestCase):
     def test_fib(self):
diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
index c9fdd6c6d..1ae436b65 100644
--- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
+++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_equal
 from pyrex_ext.primes import primes
 
 class TestPrimes(TestCase):
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index e81f98b1d..81b82c849 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_equal
 from swig_ext import example
 
 class TestExample(TestCase):
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py
index 82daed728..381b30d6a 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example2.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import sys
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite
 from swig_ext import example2
 
 class TestExample2(TestCase):
diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py
index eda209ebe..8e371b92b 100644
--- a/numpy/distutils/tests/test_fcompiler_intel.py
+++ b/numpy/distutils/tests/test_fcompiler_intel.py
@@ -1,18 +1,18 @@
 from __future__ import division, absolute_import, print_function
 
-from numpy.testing import *
-
 import numpy.distutils.fcompiler
+from numpy.testing import TestCase, run_module_suite, assert_
+
 
 intel_32bit_version_strings = [
-    ("Intel(R) Fortran Intel(R) 32-bit Compiler Professional for applications"\
+    ("Intel(R) Fortran Intel(R) 32-bit Compiler Professional for applications"
      "running on Intel(R) 32, Version 11.1", '11.1'),
 ]
 
 intel_64bit_version_strings = [
-    ("Intel(R) Fortran IA-64 Compiler Professional for applications"\
+    ("Intel(R) Fortran IA-64 Compiler Professional for applications"
      "running on IA-64, Version 11.0", '11.0'),
-    ("Intel(R) Fortran Intel(R) 64 Compiler Professional for applications"\
+    ("Intel(R) Fortran Intel(R) 64 Compiler Professional for applications"
      "running on Intel(R) 64, Version 11.1", '11.1')
 ]
 
diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py
index fd6af638f..c50b9480b 100644
--- a/numpy/distutils/tests/test_misc_util.py
+++ b/numpy/distutils/tests/test_misc_util.py
@@ -1,11 +1,15 @@
 #!/usr/bin/env python
 from __future__ import division, absolute_import, print_function
 
-from numpy.testing import *
-from numpy.distutils.misc_util import appendpath, minrelpath, \
-    gpaths, get_shared_lib_extension
 from os.path import join, sep, dirname
 
+from numpy.distutils.misc_util import (
+    appendpath, minrelpath, gpaths, get_shared_lib_extension
+)
+from numpy.testing import (
+    TestCase, run_module_suite, assert_, assert_equal
+)
+
 ajoin = lambda *paths: join(*((sep,)+paths))
 
 class TestAppendpath(TestCase):
@@ -53,7 +57,7 @@ class TestGpaths(TestCase):
         ls = gpaths('command/*.py', local_path)
         assert_(join(local_path, 'command', 'build_src.py') in ls, repr(ls))
         f = gpaths('system_info.py', local_path)
-        assert_(join(local_path, 'system_info.py')==f[0], repr(f))
+        assert_(join(local_path, 'system_info.py') == f[0], repr(f))
 
 class TestSharedExtension(TestCase):
 
diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py
index 5443ece48..9a7284270 100644
--- a/numpy/distutils/tests/test_npy_pkg_config.py
+++ b/numpy/distutils/tests/test_npy_pkg_config.py
@@ -3,8 +3,8 @@ from __future__ import division, absolute_import, print_function
 import os
 from tempfile import mkstemp
 
-from numpy.testing import *
 from numpy.distutils.npy_pkg_config import read_config, parse_flags
+from numpy.testing import TestCase, run_module_suite
 
 simple = """\
 [meta]
@@ -96,3 +96,7 @@ class TestParseFlags(TestCase):
         d = parse_flags("-L /usr/lib -lfoo -L/usr/lib -lbar")
         self.assertTrue(d['library_dirs'] == ['/usr/lib', '/usr/lib'])
         self.assertTrue(d['libraries'] == ['foo', 'bar'])
+
+
+if __name__ == '__main__':
+    run_module_suite()
diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py
index d459acde7..205f53d27 100644
--- a/numpy/distutils/tests/test_system_info.py
+++ b/numpy/distutils/tests/test_system_info.py
@@ -9,6 +9,7 @@ from numpy.testing import TestCase, run_module_suite, assert_, assert_equal
 from numpy.distutils.system_info import system_info, ConfigParser
 from numpy.distutils.system_info import default_lib_dirs, default_include_dirs
 
+
 def get_class(name, notfound_action=1):
     """
     notfound_action:
@@ -54,6 +55,7 @@ void bar(void) {
 
 
 class test_system_info(system_info):
+
     def __init__(self,
                  default_lib_dirs=default_lib_dirs,
                  default_include_dirs=default_include_dirs,
@@ -73,10 +75,10 @@ class test_system_info(system_info):
         self.cp = ConfigParser(defaults)
         # We have to parse the config files afterwards
         # to have a consistent temporary filepath
-        
+
     def _check_libs(self, lib_dirs, libs, opt_libs, exts):
         """Override _check_libs to return with all dirs """
-        info = {'libraries' : libs , 'library_dirs' : lib_dirs}
+        info = {'libraries': libs, 'library_dirs': lib_dirs}
         return info
 
 
@@ -102,11 +104,11 @@ class TestSystemInfoReading(TestCase):
         # Update local site.cfg
         global simple_site, site_cfg
         site_cfg = simple_site.format(**{
-                'dir1' : self._dir1,
-                'lib1' : self._lib1,
-                'dir2' : self._dir2,
-                'lib2' : self._lib2 
-                })
+            'dir1': self._dir1,
+            'lib1': self._lib1,
+            'dir2': self._dir2,
+            'lib2': self._lib2
+        })
         # Write site.cfg
         fd, self._sitecfg = mkstemp()
         os.close(fd)
@@ -117,7 +119,8 @@ class TestSystemInfoReading(TestCase):
             fd.write(fakelib_c_text)
         with open(self._src2, 'w') as fd:
             fd.write(fakelib_c_text)
-        # We create all class-instances 
+        # We create all class-instances
+
         def site_and_parse(c, site_cfg):
             c.files = [site_cfg]
             c.parse_config_files()
@@ -128,15 +131,15 @@ class TestSystemInfoReading(TestCase):
 
     def tearDown(self):
         # Do each removal separately
-        try: 
+        try:
             shutil.rmtree(self._dir1)
         except:
             pass
-        try: 
+        try:
             shutil.rmtree(self._dir2)
         except:
             pass
-        try: 
+        try:
             os.remove(self._sitecfg)
         except:
             pass
@@ -165,11 +168,10 @@ class TestSystemInfoReading(TestCase):
         # Now from rpath and not runtime_library_dirs
         assert_equal(tsi.get_runtime_lib_dirs(key='rpath'), [self._dir2])
         extra = tsi.calc_extra_info()
-        assert_equal(extra['extra_link_args'], ['-Wl,-rpath='+self._lib2])
+        assert_equal(extra['extra_link_args'], ['-Wl,-rpath=' + self._lib2])
 
     def test_compile1(self):
         # Compile source and link the first source
-        tsi = self.c_temp1
         c = ccompiler.new_compiler()
         try:
             # Change directory to not screw up directories
@@ -198,6 +200,6 @@ class TestSystemInfoReading(TestCase):
             os.chdir(previousDir)
         except OSError:
             pass
-        
+
 if __name__ == '__main__':
     run_module_suite()