18 files changed, 17 insertions, 53 deletions
diff --git a/numpy/distutils/command/__init__.py b/numpy/distutils/command/__init__.py
index 76a260072..3ba501de0 100644
--- a/numpy/distutils/command/__init__.py
+++ b/numpy/distutils/command/__init__.py
@@ -4,8 +4,6 @@ Package containing implementation of all the standard Distutils
 commands.
 
 """
-from __future__ import division, absolute_import, print_function
-
 def test_na_writable_attributes_deletion():
     a = np.NA(2)
     attr =  ['payload', 'dtype']
diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py
index 9c98b84d8..1475a5e24 100644
--- a/numpy/distutils/command/autodist.py
+++ b/numpy/distutils/command/autodist.py
@@ -1,8 +1,6 @@
 """This module implements additional tests ala autoconf which can be useful.
 
 """
-from __future__ import division, absolute_import, print_function
-
 import textwrap
 
 # We put them here since they could be easily reused outside numpy.distutils
diff --git a/numpy/distutils/command/bdist_rpm.py b/numpy/distutils/command/bdist_rpm.py
index 3e52a503b..682e7a8eb 100644
--- a/numpy/distutils/command/bdist_rpm.py
+++ b/numpy/distutils/command/bdist_rpm.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import os
 import sys
 if 'setuptools' in sys.modules:
diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py
index 5a9da1217..a156a7c6e 100644
--- a/numpy/distutils/command/build.py
+++ b/numpy/distutils/command/build.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import os
 import sys
 from distutils.command.build import build as old_build
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py
index 13edf0717..d679b2d03 100644
--- a/numpy/distutils/command/build_clib.py
+++ b/numpy/distutils/command/build_clib.py
@@ -1,7 +1,5 @@
 """ Modified version of build_clib that handles fortran source files.
 """
-from __future__ import division, absolute_import, print_function
-
 import os
 from glob import glob
 import shutil
@@ -11,9 +9,10 @@ from distutils.errors import DistutilsSetupError, DistutilsError, \
 
 from numpy.distutils import log
 from distutils.dep_util import newer_group
-from numpy.distutils.misc_util import filter_sources, has_f_sources,\
-     has_cxx_sources, all_strings, get_lib_source_files, is_sequence, \
-     get_numpy_include_dirs
+from numpy.distutils.misc_util import (
+    filter_sources, get_lib_source_files, get_numpy_include_dirs,
+    has_cxx_sources, has_f_sources, is_sequence
+)
 
 # Fix Python distutils bug sf #1718574:
 _l = old_build_clib.user_options
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index cd9b1c6f1..0e07ba9cf 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -1,8 +1,6 @@
 """ Modified version of build_ext that handles fortran source files.
 
 """
-from __future__ import division, absolute_import, print_function
-
 import os
 import subprocess
 from glob import glob
@@ -15,11 +13,11 @@ from distutils.file_util import copy_file
 
 from numpy.distutils import log
 from numpy.distutils.exec_command import filepath_from_subprocess_output
-from numpy.distutils.system_info import combine_paths, system_info
-from numpy.distutils.misc_util import filter_sources, has_f_sources, \
-    has_cxx_sources, get_ext_source_files, \
-    get_numpy_include_dirs, is_sequence, get_build_architecture, \
-    msvc_version
+from numpy.distutils.system_info import combine_paths
+from numpy.distutils.misc_util import (
+    filter_sources, get_ext_source_files, get_numpy_include_dirs,
+    has_cxx_sources, has_f_sources, is_sequence
+)
 from numpy.distutils.command.config_compiler import show_fortran_compilers
 
 
diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py
index 54dcde435..d30dc5bf4 100644
--- a/numpy/distutils/command/build_py.py
+++ b/numpy/distutils/command/build_py.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 from distutils.command.build_py import build_py as old_build_py
 from numpy.distutils.misc_util import is_string
 
diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py
index c8b25fc71..d5cadb274 100644
--- a/numpy/distutils/command/build_scripts.py
+++ b/numpy/distutils/command/build_scripts.py
@@ -1,8 +1,6 @@
 """ Modified version of build_scripts that handles building scripts from functions.
 
 """
-from __future__ import division, absolute_import, print_function
-
 from distutils.command.build_scripts import build_scripts as old_build_scripts
 from numpy.distutils import log
 from numpy.distutils.misc_util import is_string
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py
index 3e0522c5f..303d6197c 100644
--- a/numpy/distutils/command/build_src.py
+++ b/numpy/distutils/command/build_src.py
@@ -1,7 +1,5 @@
 """ Build swig and f2py sources.
 """
-from __future__ import division, absolute_import, print_function
-
 import os
 import re
 import sys
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index b9f2fa76e..e54a54449 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -2,13 +2,12 @@
 # try_compile call. try_run works but is untested for most of Fortran
 # compilers (they must define linker_exe first).
 # Pearu Peterson
-from __future__ import division, absolute_import, print_function
-
-import os, signal
-import warnings
-import sys
+import os
+import signal
 import subprocess
+import sys
 import textwrap
+import warnings
 
 from distutils.command.config import config as old_config
 from distutils.command.config import LANG_EXT
@@ -24,7 +23,6 @@ from numpy.distutils.command.autodist import (check_gcc_function_attribute,
                                               check_inline,
                                               check_restrict,
                                               check_compiler_gcc4)
-from numpy.distutils.compat import get_exception
 
 LANG_EXT['f77'] = '.f'
 LANG_EXT['f90'] = '.f90'
@@ -52,8 +50,7 @@ class config(old_config):
             if not self.compiler.initialized:
                 try:
                     self.compiler.initialize()
-                except IOError:
-                    e = get_exception()
+                except IOError as e:
                     msg = textwrap.dedent("""\
                         Could not initialize compiler instance: do you have Visual Studio
                         installed?  If you are trying to build with MinGW, please use "python setup.py
@@ -96,8 +93,8 @@ class config(old_config):
             self.compiler = self.fcompiler
         try:
             ret = mth(*((self,)+args))
-        except (DistutilsExecError, CompileError):
-            str(get_exception())
+        except (DistutilsExecError, CompileError) as e:
+            str(e)
             self.compiler = save_compiler
             raise CompileError
         self.compiler = save_compiler
@@ -495,7 +492,7 @@ class config(old_config):
         self._clean()
         return exitcode, output
 
-class GrabStdout(object):
+class GrabStdout:
 
     def __init__(self):
         self.sys_stdout = sys.stdout
diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py
index bf170063e..44265bfcc 100644
--- a/numpy/distutils/command/config_compiler.py
+++ b/numpy/distutils/command/config_compiler.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 from distutils.core import Command
 from numpy.distutils import log
 
diff --git a/numpy/distutils/command/develop.py b/numpy/distutils/command/develop.py
index 1410ab2a0..af24baf2e 100644
--- a/numpy/distutils/command/develop.py
+++ b/numpy/distutils/command/develop.py
@@ -3,8 +3,6 @@ generated files (from build_src or build_scripts) are properly converted to real
 files with filenames.
 
 """
-from __future__ import division, absolute_import, print_function
-
 from setuptools.command.develop import develop as old_develop
 
 class develop(old_develop):
diff --git a/numpy/distutils/command/egg_info.py b/numpy/distutils/command/egg_info.py
index 18673ece7..14c62b4d1 100644
--- a/numpy/distutils/command/egg_info.py
+++ b/numpy/distutils/command/egg_info.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 
 from setuptools.command.egg_info import egg_info as _egg_info
diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py
index c74ae9446..2eff2d145 100644
--- a/numpy/distutils/command/install.py
+++ b/numpy/distutils/command/install.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 if 'setuptools' in sys.modules:
     import setuptools.command.install as old_install_mod
diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py
index 6a73f7e33..aa2e5594c 100644
--- a/numpy/distutils/command/install_clib.py
+++ b/numpy/distutils/command/install_clib.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import os
 from distutils.core import Command
 from distutils.ccompiler import new_compiler
diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py
index 996cf7e40..0a2e68ae1 100644
--- a/numpy/distutils/command/install_data.py
+++ b/numpy/distutils/command/install_data.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 have_setuptools = ('setuptools' in sys.modules)
 
diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py
index f3f58aa28..bb4ad563b 100644
--- a/numpy/distutils/command/install_headers.py
+++ b/numpy/distutils/command/install_headers.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import os
 from distutils.command.install_headers import install_headers as old_install_headers
 
diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py
index bfaab1c8f..e34193883 100644
--- a/numpy/distutils/command/sdist.py
+++ b/numpy/distutils/command/sdist.py
@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import sys
 if 'setuptools' in sys.modules:
     from setuptools.command.sdist import sdist as old_sdist