2to3: Use absolute imports.

The new import `absolute_import` is added the `from __future__ import`
statement and The 2to3 `import` fixer is run to make the imports
compatible. There are several things that need to be dealt with to make
this work.

1) Files meant to be run as scripts run in a different environment than
files imported as part of a package, and so changes to those files need
to be skipped. The affected script files are:

    * all setup.py files
    * numpy/core/code_generators/generate_umath.py
    * numpy/core/code_generators/generate_numpy_api.py
    * numpy/core/code_generators/generate_ufunc_api.py

2) Some imported modules are not available as they are created during
the build process and consequently 2to3 is unable to handle them
correctly. Files that import those modules need a bit of extra work.
The affected files are:

    * core/__init__.py,
    * core/numeric.py,
    * core/_internal.py,
    * core/arrayprint.py,
    * core/fromnumeric.py,
    * numpy/__init__.py,
    * lib/npyio.py,
    * lib/function_base.py,
    * fft/fftpack.py,
    * random/__init__.py

Closes #3172

72 files changed, 83 insertions, 83 deletions

diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py
index 5b68de74f..2a99ef8ad 100644
--- a/numpy/distutils/__init__.py
+++ b/numpy/distutils/__init__.py
@@ -1,16 +1,16 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 
 if sys.version_info[0] < 3:
-    from __version__ import version as __version__
+    from .__version__ import version as __version__
     # Must import local ccompiler ASAP in order to get
     # customized CCompiler.spawn effective.
-    import ccompiler
-    import unixccompiler
+    from . import ccompiler
+    from . import unixccompiler
 
-    from info import __doc__
-    from npy_pkg_config import *
+    from .info import __doc__
+    from .npy_pkg_config import *
 
     try:
         import __config__
diff --git a/numpy/distutils/__version__.py b/numpy/distutils/__version__.py
index c9af8cdb1..e1bc8d30f 100644
--- a/numpy/distutils/__version__.py
+++ b/numpy/distutils/__version__.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 major = 0
 minor = 4
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
index 4478154f8..247eead42 100644
--- a/numpy/distutils/ccompiler.py
+++ b/numpy/distutils/ccompiler.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import re
 import os
@@ -165,7 +165,7 @@ def CCompiler_compile(self, sources, output_dir=None, macros=None,
         return []
     # FIXME:RELATIVE_IMPORT
     if sys.version_info[0] < 3:
-        from fcompiler import FCompiler
+        from .fcompiler import FCompiler
     else:
         from numpy.distutils.fcompiler import FCompiler
     if isinstance(self, FCompiler):
diff --git a/numpy/distutils/command/__init__.py b/numpy/distutils/command/__init__.py
index 09fe78d22..4c4ddbf1f 100644
--- a/numpy/distutils/command/__init__.py
+++ b/numpy/distutils/command/__init__.py
@@ -4,7 +4,7 @@ Package containing implementation of all the standard Distutils
 commands.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 def test_na_writable_attributes_deletion():
     a = np.NA(2)
diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py
index 2e31fe22a..3d71bb68e 100644
--- a/numpy/distutils/command/autodist.py
+++ b/numpy/distutils/command/autodist.py
@@ -1,7 +1,7 @@
 """This module implements additional tests ala autoconf which can be useful.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 
 # 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 302c6fdd2..004f67b9d 100644
--- a/numpy/distutils/command/bdist_rpm.py
+++ b/numpy/distutils/command/bdist_rpm.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py
index 239cafe1e..f0755373b 100644
--- a/numpy/distutils/command/build.py
+++ b/numpy/distutils/command/build.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py
index 99144d7b5..87005e05f 100644
--- a/numpy/distutils/command/build_clib.py
+++ b/numpy/distutils/command/build_clib.py
@@ -1,6 +1,6 @@
 """ Modified version of build_clib that handles fortran source files.
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 from glob import glob
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index 2245661a5..d1092a85b 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -1,7 +1,7 @@
 """ Modified version of build_ext that handles fortran source files.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py
index e8c7b8f83..655e56b87 100644
--- a/numpy/distutils/command/build_py.py
+++ b/numpy/distutils/command/build_py.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 1a3d26d58..17cc6aaed 100644
--- a/numpy/distutils/command/build_scripts.py
+++ b/numpy/distutils/command/build_scripts.py
@@ -1,7 +1,7 @@
 """ Modified version of build_scripts that handles building scripts from functions.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 from distutils.command.build_scripts import build_scripts as old_build_scripts
 from numpy.distutils import log
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py
index cacfc472b..d9a9023b0 100644
--- a/numpy/distutils/command/build_src.py
+++ b/numpy/distutils/command/build_src.py
@@ -1,6 +1,6 @@
 """ Build swig, f2py, pyrex sources.
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import re
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index 3417fac44..055fd26a9 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -2,7 +2,7 @@
 # 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
+from __future__ import division, absolute_import
 
 import os, signal
 import warnings
diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py
index 6894b4552..3303d3469 100644
--- a/numpy/distutils/command/config_compiler.py
+++ b/numpy/distutils/command/config_compiler.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 8328effcf..17661e0bd 100644
--- a/numpy/distutils/command/develop.py
+++ b/numpy/distutils/command/develop.py
@@ -3,7 +3,7 @@ generated files (from build_src or build_scripts) are properly converted to real
 files with filenames.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 from setuptools.command.develop import develop as old_develop
 
diff --git a/numpy/distutils/command/egg_info.py b/numpy/distutils/command/egg_info.py
index 33c64b0e4..3a908f602 100644
--- a/numpy/distutils/command/egg_info.py
+++ b/numpy/distutils/command/egg_info.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 d9b84fc08..37523c8e4 100644
--- a/numpy/distutils/command/install.py
+++ b/numpy/distutils/command/install.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 if 'setuptools' in sys.modules:
diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py
index 8845cedab..7753020e5 100644
--- a/numpy/distutils/command/install_clib.py
+++ b/numpy/distutils/command/install_clib.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 from distutils.core import Command
diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py
index d99d656db..afdc98013 100644
--- a/numpy/distutils/command/install_data.py
+++ b/numpy/distutils/command/install_data.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 548c3c643..c6c01e35b 100644
--- a/numpy/distutils/command/install_headers.py
+++ b/numpy/distutils/command/install_headers.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 3e07f7a01..a4e2158ce 100644
--- a/numpy/distutils/command/sdist.py
+++ b/numpy/distutils/command/sdist.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 if 'setuptools' in sys.modules:
diff --git a/numpy/distutils/compat.py b/numpy/distutils/compat.py
index 55b9627d5..bd4184dcd 100644
--- a/numpy/distutils/compat.py
+++ b/numpy/distutils/compat.py
@@ -2,7 +2,7 @@
 numpy.distutils
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 
diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py
index 6b969cef3..77e2eb5e1 100644
--- a/numpy/distutils/conv_template.py
+++ b/numpy/distutils/conv_template.py
@@ -78,7 +78,7 @@ Example:
         3, 3, jim
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 
 __all__ = ['process_str', 'process_file']
diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py
index f450b1564..711d5a223 100644
--- a/numpy/distutils/core.py
+++ b/numpy/distutils/core.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from distutils.core import *
diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py
index 86a18993a..1e2d9379c 100644
--- a/numpy/distutils/cpuinfo.py
+++ b/numpy/distutils/cpuinfo.py
@@ -12,7 +12,7 @@ NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['cpu']
 
diff --git a/numpy/distutils/environment.py b/numpy/distutils/environment.py
index 015815cbe..1360d82fe 100644
--- a/numpy/distutils/environment.py
+++ b/numpy/distutils/environment.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 from distutils.dist import Distribution
diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py
index a469fc5e0..923486158 100644
--- a/numpy/distutils/exec_command.py
+++ b/numpy/distutils/exec_command.py
@@ -44,7 +44,7 @@ Known bugs:
 - Tests, that send messages to stderr, fail when executed from MSYS prompt
   because the messages are lost at some point.
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['exec_command','find_executable']
 
diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py
index 95213644f..f58b27780 100644
--- a/numpy/distutils/extension.py
+++ b/numpy/distutils/extension.py
@@ -6,7 +6,7 @@ modules in setup scripts.
 Overridden to support f2py.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __revision__ = "$Id: extension.py,v 1.1 2005/04/09 19:29:34 pearu Exp $"
 
diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py
index 510a38a58..c0b587fed 100644
--- a/numpy/distutils/fcompiler/__init__.py
+++ b/numpy/distutils/fcompiler/__init__.py
@@ -13,7 +13,7 @@ should be a list.
 But note that FCompiler.executables is actually a dictionary of commands.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['FCompiler','new_fcompiler','show_fcompilers',
            'dummy_fortran_file']
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py
index 7c06d70a3..2fb579e35 100644
--- a/numpy/distutils/fcompiler/absoft.py
+++ b/numpy/distutils/fcompiler/absoft.py
@@ -5,7 +5,7 @@
 # Notes:
 # - when using -g77 then use -DUNDERSCORE_G77 to compile f2py
 #   generated extension modules (works for f2py v2.45.241_1936 and up)
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 
diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py
index d67c1f24e..16f3a0e54 100644
--- a/numpy/distutils/fcompiler/compaq.py
+++ b/numpy/distutils/fcompiler/compaq.py
@@ -1,6 +1,6 @@
 
 #http://www.compaq.com/fortran/docs/
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py
index 478f48f3e..41b781010 100644
--- a/numpy/distutils/fcompiler/g95.py
+++ b/numpy/distutils/fcompiler/g95.py
@@ -1,5 +1,5 @@
 # http://g95.sourceforge.net/
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
index c26e81fcd..80dbf48c6 100644
--- a/numpy/distutils/fcompiler/gnu.py
+++ b/numpy/distutils/fcompiler/gnu.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import re
 import os
diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py
index 44bfbe1c2..250159107 100644
--- a/numpy/distutils/fcompiler/hpux.py
+++ b/numpy/distutils/fcompiler/hpux.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py
index b3126b558..09001c500 100644
--- a/numpy/distutils/fcompiler/ibm.py
+++ b/numpy/distutils/fcompiler/ibm.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import re
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
index 53ea7af05..b975d1f1b 100644
--- a/numpy/distutils/fcompiler/intel.py
+++ b/numpy/distutils/fcompiler/intel.py
@@ -1,5 +1,5 @@
 # http://developer.intel.com/software/products/compilers/flin/
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 
diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py
index 06c4c6f56..208f09a27 100644
--- a/numpy/distutils/fcompiler/lahey.py
+++ b/numpy/distutils/fcompiler/lahey.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 
diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py
index 6cd2fdfac..433f053e3 100644
--- a/numpy/distutils/fcompiler/mips.py
+++ b/numpy/distutils/fcompiler/mips.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 11253c4be..8cbd15f60 100644
--- a/numpy/distutils/fcompiler/nag.py
+++ b/numpy/distutils/fcompiler/nag.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.distutils.fcompiler import FCompiler
diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py
index e99c2ab35..ee7e6dee9 100644
--- a/numpy/distutils/fcompiler/none.py
+++ b/numpy/distutils/fcompiler/none.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py
index c9bd58c62..3b3c31e00 100644
--- a/numpy/distutils/fcompiler/pathf95.py
+++ b/numpy/distutils/fcompiler/pathf95.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.distutils.fcompiler import FCompiler
 
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py
index e0f5e0d44..959f86d68 100644
--- a/numpy/distutils/fcompiler/pg.py
+++ b/numpy/distutils/fcompiler/pg.py
@@ -1,5 +1,5 @@
 # http://www.pgroup.com
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.distutils.fcompiler import FCompiler
 from sys import platform
diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py
index 7deeac29a..bff37a543 100644
--- a/numpy/distutils/fcompiler/sun.py
+++ b/numpy/distutils/fcompiler/sun.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 bddc1be91..2d6d164a1 100644
--- a/numpy/distutils/fcompiler/vast.py
+++ b/numpy/distutils/fcompiler/vast.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 
diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py
index 99f36e371..dc933dd6a 100644
--- a/numpy/distutils/from_template.py
+++ b/numpy/distutils/from_template.py
@@ -45,7 +45,7 @@ process_file(filename)
   <ctypereal=float,double,\\0,\\1>
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['process_str','process_file']
 
diff --git a/numpy/distutils/info.py b/numpy/distutils/info.py
index 4d8b847bd..de3dc4f48 100644
--- a/numpy/distutils/info.py
+++ b/numpy/distutils/info.py
@@ -1,6 +1,6 @@
 """
 Enhanced distutils with Fortran compilers support and more.
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 postpone_import = True
diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py
index 8c3af0957..58208647d 100644
--- a/numpy/distutils/intelccompiler.py
+++ b/numpy/distutils/intelccompiler.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 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 0e98e17ef..b2c4f1f28 100644
--- a/numpy/distutils/lib2def.py
+++ b/numpy/distutils/lib2def.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import re
 import sys
diff --git a/numpy/distutils/line_endings.py b/numpy/distutils/line_endings.py
index f18850716..93f5421c0 100644
--- a/numpy/distutils/line_endings.py
+++ b/numpy/distutils/line_endings.py
@@ -1,7 +1,7 @@
 """ Functions for converting from DOS to UNIX line endings
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys, re, os
 
diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py
index a3f4cb9ff..41c9a56da 100644
--- a/numpy/distutils/log.py
+++ b/numpy/distutils/log.py
@@ -1,5 +1,5 @@
 # Colored log, requires Python 2.3 or up.
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from distutils.log import *
@@ -7,7 +7,7 @@ from distutils.log import Log as old_Log
 from distutils.log import _global_log
 
 if sys.version_info[0] < 3:
-    from misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
+    from .misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
 else:
     from numpy.distutils.misc_util import red_text, default_text, cyan_text, green_text, is_sequence, is_string
 
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index 10e3608ef..0505309fa 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -7,7 +7,7 @@ Support code for building Python extensions on Windows.
     # 3. Force windows to use g77
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import subprocess
@@ -19,7 +19,7 @@ import re
 import numpy.distutils.ccompiler
 
 if sys.version_info[0] < 3:
-    import log
+    from . import log
 else:
     from numpy.distutils import log
 # NT stuff
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 20cacb759..f526557d6 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import re
@@ -1990,7 +1990,7 @@ class Configuration(object):
         Return information (from system_info.get_info) for all of the names in
         the argument list in a single dictionary.
         """
-        from system_info import get_info, dict_append
+        from .system_info import get_info, dict_append
         info_dict = {}
         for a in names:
             dict_append(info_dict,**get_info(a))
diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py
index 6f3072885..2dacbbc70 100644
--- a/numpy/distutils/npy_pkg_config.py
+++ b/numpy/distutils/npy_pkg_config.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 if sys.version_info[0] < 3:
diff --git a/numpy/distutils/numpy_distribution.py b/numpy/distutils/numpy_distribution.py
index 276f81398..353e18a51 100644
--- a/numpy/distutils/numpy_distribution.py
+++ b/numpy/distutils/numpy_distribution.py
@@ -1,5 +1,5 @@
 # XXX: Handle setuptools ?
-from __future__ import division
+from __future__ import division, absolute_import
 
 from distutils.core import Distribution
 
diff --git a/numpy/distutils/pathccompiler.py b/numpy/distutils/pathccompiler.py
index 2e5b76a53..e847e7d0a 100644
--- a/numpy/distutils/pathccompiler.py
+++ b/numpy/distutils/pathccompiler.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from distutils.unixccompiler import UnixCCompiler
 
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index 869bd6bd1..68ad926e3 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -110,7 +110,7 @@ this distribution for specifics.
 NO WARRANTY IS EXPRESSED OR IMPLIED.  USE AT YOUR OWN RISK.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 import os
@@ -929,7 +929,7 @@ class mkl_info(system_info):
         if mklroot is None:
             system_info.__init__(self)
         else:
-            from cpuinfo import cpu
+            from .cpuinfo import cpu
             l = 'mkl'  # use shared library
             if cpu.is_Itanium():
                 plt = '64'
diff --git a/numpy/distutils/tests/f2py_ext/__init__.py b/numpy/distutils/tests/f2py_ext/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/distutils/tests/f2py_ext/__init__.py
+++ b/numpy/distutils/tests/f2py_ext/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
index 696ee41d8..149256d72 100644
--- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
+++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/f2py_f90_ext/__init__.py b/numpy/distutils/tests/f2py_f90_ext/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/distutils/tests/f2py_f90_ext/__init__.py
+++ b/numpy/distutils/tests/f2py_f90_ext/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
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 3fa7b3730..d68981c04 100644
--- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
+++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/gen_ext/__init__.py b/numpy/distutils/tests/gen_ext/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/distutils/tests/gen_ext/__init__.py
+++ b/numpy/distutils/tests/gen_ext/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
index 3fa72036e..0f194255d 100644
--- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py
+++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/pyrex_ext/__init__.py b/numpy/distutils/tests/pyrex_ext/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/distutils/tests/pyrex_ext/__init__.py
+++ b/numpy/distutils/tests/pyrex_ext/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
index 96f73c426..a2bb091ea 100644
--- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
+++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/swig_ext/__init__.py b/numpy/distutils/tests/swig_ext/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/distutils/tests/swig_ext/__init__.py
+++ b/numpy/distutils/tests/swig_ext/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index 5a4765fa7..419ca53d8 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py
index c3c4727c0..f876bad16 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example2.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 from numpy.testing import *
diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py
index d3b38db23..09a7275f8 100644
--- a/numpy/distutils/tests/test_fcompiler_gnu.py
+++ b/numpy/distutils/tests/test_fcompiler_gnu.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 
diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py
index 4ebf1a0c0..8e3ba5fd3 100644
--- a/numpy/distutils/tests/test_fcompiler_intel.py
+++ b/numpy/distutils/tests/test_fcompiler_intel.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 
diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py
index 57fde8899..b19c09f81 100644
--- a/numpy/distutils/tests/test_misc_util.py
+++ b/numpy/distutils/tests/test_misc_util.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy.distutils.misc_util import appendpath, minrelpath, gpaths, rel_path
diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py
index d3568eb6b..e25f47d76 100644
--- a/numpy/distutils/tests/test_npy_pkg_config.py
+++ b/numpy/distutils/tests/test_npy_pkg_config.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 from tempfile import mkstemp
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
index 837ce5092..2825a899b 100644
--- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py
@@ -2,7 +2,7 @@
 unixccompiler - can handle very long argument lists for ar.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 
@@ -12,7 +12,7 @@ from numpy.distutils.ccompiler import replace_method
 from numpy.distutils.compat import get_exception
 
 if sys.version_info[0] < 3:
-    import log
+    from . import log
 else:
     from numpy.distutils import log