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

1 files changed, 20 insertions, 20 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index 03e2afe6e..9cae9d388 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -104,7 +104,7 @@ available as array methods, i.e. ``x = np.array([1,2,3]); x.sort()``.
 Exceptions to this rule are documented.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 # We first need to detect if we're being called as part of the numpy setup
 # procedure itself in a reliable manner.
@@ -126,43 +126,43 @@ else:
         its source directory; please exit the numpy source tree, and relaunch
         your python intepreter from there."""
         raise ImportError(msg)
-    from version import git_revision as __git_revision__
-    from version import version as __version__
+    from .version import git_revision as __git_revision__
+    from .version import version as __version__
 
-    from _import_tools import PackageLoader
+    from ._import_tools import PackageLoader
 
     def pkgload(*packages, **options):
         loader = PackageLoader(infunc=True)
         return loader(*packages, **options)
 
-    import add_newdocs
+    from . import add_newdocs
     __all__ = ['add_newdocs']
 
     pkgload.__doc__ = PackageLoader.__call__.__doc__
 
-    from testing import Tester
+    from .testing import Tester
     test = Tester().test
     bench = Tester().bench
 
-    import core
-    from core import *
-    import compat
-    import lib
-    from lib import *
-    import linalg
-    import fft
-    import polynomial
-    import random
-    import ctypeslib
-    import ma
-    import matrixlib as _mat
-    from matrixlib import *
+    from . import core
+    from .core import *
+    from . import compat
+    from . import lib
+    from .lib import *
+    from . import linalg
+    from . import fft
+    from . import polynomial
+    from . import random
+    from . import ctypeslib
+    from . import ma
+    from . import matrixlib as _mat
+    from .matrixlib import *
 
     # Make these accessible from numpy name-space
     #  but not imported in from numpy import *
     from __builtin__ import bool, int, long, float, complex, \
          object, unicode, str
-    from core import round, abs, max, min
+    from .core import round, abs, max, min
 
     __all__.extend(['__version__', 'pkgload', 'PackageLoader',
                'show_config'])