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

18 files changed, 18 insertions, 18 deletions

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: