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

23 files changed, 52 insertions, 52 deletions

diff --git a/numpy/oldnumeric/__init__.py b/numpy/oldnumeric/__init__.py
index 68bd39e45..ff8c00885 100644
--- a/numpy/oldnumeric/__init__.py
+++ b/numpy/oldnumeric/__init__.py
@@ -1,7 +1,7 @@
 """Don't add these to the __all__ variable though
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy import *
 
@@ -15,17 +15,17 @@ def _move_axis_to_0(a, axis):
     return transpose(a, axes)
 
 # Add these
-from compat import *
-from functions import *
-from precision import *
-from ufuncs import *
-from misc import *
-
-import compat
-import precision
-import functions
-import misc
-import ufuncs
+from .compat import *
+from .functions import *
+from .precision import *
+from .ufuncs import *
+from .misc import *
+
+from . import compat
+from . import precision
+from . import functions
+from . import misc
+from . import ufuncs
 
 import numpy
 __version__ = numpy.__version__
diff --git a/numpy/oldnumeric/alter_code1.py b/numpy/oldnumeric/alter_code1.py
index 5eb1c99f2..f970994e4 100644
--- a/numpy/oldnumeric/alter_code1.py
+++ b/numpy/oldnumeric/alter_code1.py
@@ -29,7 +29,7 @@ Makes the following changes:
    isinstance(..., <type>)
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
diff --git a/numpy/oldnumeric/alter_code2.py b/numpy/oldnumeric/alter_code2.py
index 61f285f63..6d33efd60 100644
--- a/numpy/oldnumeric/alter_code2.py
+++ b/numpy/oldnumeric/alter_code2.py
@@ -19,7 +19,7 @@ Makes the following changes:
    oldnumeric.random_array, and oldnumeric.fft
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 #__all__ = ['convertfile', 'convertall', 'converttree']
 __all__ = []
diff --git a/numpy/oldnumeric/array_printer.py b/numpy/oldnumeric/array_printer.py
index 7c0428c14..f14872821 100644
--- a/numpy/oldnumeric/array_printer.py
+++ b/numpy/oldnumeric/array_printer.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['array2string']
 
diff --git a/numpy/oldnumeric/arrayfns.py b/numpy/oldnumeric/arrayfns.py
index 1db219d4a..03f816db8 100644
--- a/numpy/oldnumeric/arrayfns.py
+++ b/numpy/oldnumeric/arrayfns.py
@@ -1,7 +1,7 @@
 """Backward compatible with arrayfns from Numeric.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['array_set', 'construct3', 'digitize', 'error', 'find_mask',
            'histogram', 'index_sort', 'interp', 'nz', 'reverse', 'span',
diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py
index 0c18917d0..46c3c727f 100644
--- a/numpy/oldnumeric/compat.py
+++ b/numpy/oldnumeric/compat.py
@@ -1,7 +1,7 @@
 """Compatibility module containing deprecated names.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['NewAxis',
            'UFuncType', 'UfuncType', 'ArrayType', 'arraytype',
@@ -16,7 +16,7 @@ __all__ = ['NewAxis',
 import numpy.core.multiarray as multiarray
 import numpy.core.umath as um
 from numpy.core.numeric import array
-import functions
+from . import functions
 import sys
 
 from cPickle import dump, dumps
@@ -78,7 +78,7 @@ def load(fp):
     return loads(fp.read())
 
 def _LoadArray(fp):
-    import typeconv
+    from . import typeconv
     ln = fp.readline().split()
     if ln[0][0] == 'A': ln[0] = ln[0][1:]
     typecode = ln[0][0]
diff --git a/numpy/oldnumeric/fft.py b/numpy/oldnumeric/fft.py
index ace7d27d9..7ea554e4a 100644
--- a/numpy/oldnumeric/fft.py
+++ b/numpy/oldnumeric/fft.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['fft', 'fft2d', 'fftnd', 'hermite_fft', 'inverse_fft',
            'inverse_fft2d', 'inverse_fftnd',
diff --git a/numpy/oldnumeric/fix_default_axis.py b/numpy/oldnumeric/fix_default_axis.py
index 262f82859..cefa67239 100644
--- a/numpy/oldnumeric/fix_default_axis.py
+++ b/numpy/oldnumeric/fix_default_axis.py
@@ -34,7 +34,7 @@ std
 mean
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['convertfile', 'convertall', 'converttree']
 
diff --git a/numpy/oldnumeric/functions.py b/numpy/oldnumeric/functions.py
index 1e4daef5d..50c11e32c 100644
--- a/numpy/oldnumeric/functions.py
+++ b/numpy/oldnumeric/functions.py
@@ -1,12 +1,12 @@
 """Functions that should behave the same as Numeric and need changing
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import numpy as np
 import numpy.core.multiarray as mu
 import numpy.core.numeric as nn
-from typeconv import convtypecode, convtypecode2
+from .typeconv import convtypecode, convtypecode2
 
 __all__ = ['take', 'repeat', 'sum', 'product', 'sometrue', 'alltrue',
            'cumsum', 'cumproduct', 'compress', 'fromfunction',
diff --git a/numpy/oldnumeric/linear_algebra.py b/numpy/oldnumeric/linear_algebra.py
index a8600c77d..e850cd792 100644
--- a/numpy/oldnumeric/linear_algebra.py
+++ b/numpy/oldnumeric/linear_algebra.py
@@ -6,7 +6,7 @@ only accesses the following LAPACK functions: dgesv, zgesv, dgeev,
 zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['LinAlgError', 'solve_linear_equations',
            'inverse', 'cholesky_decomposition', 'eigenvalues',
diff --git a/numpy/oldnumeric/ma.py b/numpy/oldnumeric/ma.py
index 46af041ba..b449d619c 100644
--- a/numpy/oldnumeric/ma.py
+++ b/numpy/oldnumeric/ma.py
@@ -9,7 +9,7 @@ Adapted for numpy_core 2005 by Travis Oliphant and
 (mainly) Paul Dubois.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import types, sys
 
diff --git a/numpy/oldnumeric/matrix.py b/numpy/oldnumeric/matrix.py
index 9be08e93c..e76f8935f 100644
--- a/numpy/oldnumeric/matrix.py
+++ b/numpy/oldnumeric/matrix.py
@@ -1,12 +1,12 @@
 """This module is for compatibility only.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['UserArray', 'squeeze', 'Matrix', 'asarray', 'dot', 'k', 'Numeric', 'LinearAlgebra', 'identity', 'multiply', 'types', 'string']
 
 import types
-from user_array import UserArray, asarray
+from .user_array import UserArray, asarray
 import numpy.oldnumeric as Numeric
 from numpy.oldnumeric import dot, identity, multiply
 import numpy.oldnumeric.linear_algebra as LinearAlgebra
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index 3871d8251..8f1e1ae96 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -1,7 +1,7 @@
 """Functions that already have the correct syntax or miscellaneous functions
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['sort', 'copy_reg', 'clip', 'rank',
            'sign', 'shape', 'types', 'allclose', 'size',
@@ -35,4 +35,4 @@ from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\
      correlate as cross_correlate, \
      place as insert
 
-from array_printer import array2string
+from .array_printer import array2string
diff --git a/numpy/oldnumeric/mlab.py b/numpy/oldnumeric/mlab.py
index e2ea78c02..d4063f65e 100644
--- a/numpy/oldnumeric/mlab.py
+++ b/numpy/oldnumeric/mlab.py
@@ -1,7 +1,7 @@
 """This module is for compatibility only.  All functions are defined elsewhere.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['rand', 'tril', 'trapz', 'hanning', 'rot90', 'triu', 'diff', 'angle',
            'roots', 'ptp', 'kaiser', 'randn', 'cumprod', 'diag', 'msort',
@@ -21,7 +21,7 @@ from numpy.linalg import eig, svd
 from numpy.random import rand, randn
 import numpy as np
 
-from typeconv import convtypecode
+from .typeconv import convtypecode
 
 def eye(N, M=None, k=0, typecode=None, dtype=None):
     """ eye returns a N-by-M 2-d array where the  k-th diagonal is all ones,
@@ -98,17 +98,17 @@ def corrcoef(x, y=None):
     d = diag(c)
     return c/sqrt(multiply.outer(d,d))
 
-from compat import *
-from functions import *
-from precision import *
-from ufuncs import *
-from misc import *
-
-import compat
-import precision
-import functions
-import misc
-import ufuncs
+from .compat import *
+from .functions import *
+from .precision import *
+from .ufuncs import *
+from .misc import *
+
+from . import compat
+from . import precision
+from . import functions
+from . import misc
+from . import ufuncs
 
 import numpy
 __version__ = numpy.__version__
diff --git a/numpy/oldnumeric/precision.py b/numpy/oldnumeric/precision.py
index c6579f302..7c85f21fc 100644
--- a/numpy/oldnumeric/precision.py
+++ b/numpy/oldnumeric/precision.py
@@ -6,13 +6,13 @@ The character strings are still for "new" NumPy
 which is the only Incompatibility with Numeric
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['Character', 'Complex', 'Float',
            'PrecisionError', 'PyObject', 'Int', 'UInt',
            'UnsignedInt', 'UnsignedInteger', 'string', 'typecodes', 'zeros']
 
-from functions import zeros
+from .functions import zeros
 import string   # for backwards compatibility
 
 typecodes = {'Character':'c', 'Integer':'bhil', 'UnsignedInteger':'BHIL', 'Float':'fd', 'Complex':'FD'}
diff --git a/numpy/oldnumeric/random_array.py b/numpy/oldnumeric/random_array.py
index a7f6c4112..4dcddda12 100644
--- a/numpy/oldnumeric/random_array.py
+++ b/numpy/oldnumeric/random_array.py
@@ -1,7 +1,7 @@
 """Backward compatible module for RandomArray
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['ArgumentError','F','beta','binomial','chi_square', 'exponential',
            'gamma', 'get_seed', 'mean_var_test', 'multinomial',
diff --git a/numpy/oldnumeric/rng.py b/numpy/oldnumeric/rng.py
index 28fb9d591..3ad0b4190 100644
--- a/numpy/oldnumeric/rng.py
+++ b/numpy/oldnumeric/rng.py
@@ -4,7 +4,7 @@ Replace import RNG with import numpy.oldnumeric.rng as RNG.
 It is for backwards compatibility only.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['CreateGenerator','ExponentialDistribution','LogNormalDistribution',
            'NormalDistribution', 'UniformDistribution', 'error', 'ranf',
diff --git a/numpy/oldnumeric/rng_stats.py b/numpy/oldnumeric/rng_stats.py
index 96e50f9a4..43d763046 100644
--- a/numpy/oldnumeric/rng_stats.py
+++ b/numpy/oldnumeric/rng_stats.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['average', 'histogram', 'standardDeviation', 'variance']
 
diff --git a/numpy/oldnumeric/tests/test_oldnumeric.py b/numpy/oldnumeric/tests/test_oldnumeric.py
index 58ccc710a..488b2b471 100644
--- a/numpy/oldnumeric/tests/test_oldnumeric.py
+++ b/numpy/oldnumeric/tests/test_oldnumeric.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import unittest
 
diff --git a/numpy/oldnumeric/tests/test_regression.py b/numpy/oldnumeric/tests/test_regression.py
index dd221699d..d169d6f3f 100644
--- a/numpy/oldnumeric/tests/test_regression.py
+++ b/numpy/oldnumeric/tests/test_regression.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 
diff --git a/numpy/oldnumeric/typeconv.py b/numpy/oldnumeric/typeconv.py
index 014477950..c3a27f5a3 100644
--- a/numpy/oldnumeric/typeconv.py
+++ b/numpy/oldnumeric/typeconv.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes']
 
diff --git a/numpy/oldnumeric/ufuncs.py b/numpy/oldnumeric/ufuncs.py
index 9ace30a91..7da0b5a93 100644
--- a/numpy/oldnumeric/ufuncs.py
+++ b/numpy/oldnumeric/ufuncs.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['less', 'cosh', 'arcsinh', 'add', 'ceil', 'arctan2', 'floor_divide',
            'fmod', 'hypot', 'logical_and', 'power', 'sinh', 'remainder', 'cos',
diff --git a/numpy/oldnumeric/user_array.py b/numpy/oldnumeric/user_array.py
index 08be8135b..8d2421f4a 100644
--- a/numpy/oldnumeric/user_array.py
+++ b/numpy/oldnumeric/user_array.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.oldnumeric import *
 from numpy.lib.user_array import container as UserArray