summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-03-27 21:49:08 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-03-28 08:43:26 -0600
commitd4b88c1dbd6898fb6fcebc97f36b421999340f71 (patch)
tree61cc0282cf2509afe364c91e97b59dfb2ebcafd3 /numpy/core
parent40742184df68fc01f3392c9865f35d5402e74b01 (diff)
downloadnumpy-d4b88c1dbd6898fb6fcebc97f36b421999340f71.tar.gz
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
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/__init__.py52
-rw-r--r--numpy/core/_internal.py12
-rw-r--r--numpy/core/_methods.py2
-rw-r--r--numpy/core/arrayprint.py18
-rw-r--r--numpy/core/code_generators/__init__.py2
-rw-r--r--numpy/core/code_generators/cversions.py6
-rw-r--r--numpy/core/code_generators/genapi.py2
-rw-r--r--numpy/core/code_generators/numpy_api.py2
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py2
-rw-r--r--numpy/core/defchararray.py8
-rw-r--r--numpy/core/fromnumeric.py12
-rw-r--r--numpy/core/function_base.py6
-rw-r--r--numpy/core/getlimits.py10
-rw-r--r--numpy/core/info.py2
-rw-r--r--numpy/core/machar.py2
-rw-r--r--numpy/core/memmap.py4
-rw-r--r--numpy/core/numeric.py20
-rw-r--r--numpy/core/numerictypes.py2
-rw-r--r--numpy/core/records.py8
-rw-r--r--numpy/core/setup_common.py2
-rw-r--r--numpy/core/shape_base.py6
-rw-r--r--numpy/core/src/multiarray/testcalcs.py2
-rw-r--r--numpy/core/tests/test_api.py2
-rw-r--r--numpy/core/tests/test_arrayprint.py2
-rw-r--r--numpy/core/tests/test_blasdot.py2
-rw-r--r--numpy/core/tests/test_datetime.py2
-rw-r--r--numpy/core/tests/test_defchararray.py2
-rw-r--r--numpy/core/tests/test_deprecations.py2
-rw-r--r--numpy/core/tests/test_dtype.py2
-rw-r--r--numpy/core/tests/test_einsum.py2
-rw-r--r--numpy/core/tests/test_errstate.py2
-rw-r--r--numpy/core/tests/test_function_base.py2
-rw-r--r--numpy/core/tests/test_getlimits.py2
-rw-r--r--numpy/core/tests/test_half.py2
-rw-r--r--numpy/core/tests/test_indexerrors.py2
-rw-r--r--numpy/core/tests/test_indexing.py2
-rw-r--r--numpy/core/tests/test_item_selection.py2
-rw-r--r--numpy/core/tests/test_machar.py2
-rw-r--r--numpy/core/tests/test_memmap.py2
-rw-r--r--numpy/core/tests/test_multiarray.py2
-rw-r--r--numpy/core/tests/test_multiarray_assignment.py2
-rw-r--r--numpy/core/tests/test_nditer.py2
-rw-r--r--numpy/core/tests/test_numeric.py2
-rw-r--r--numpy/core/tests/test_numerictypes.py2
-rw-r--r--numpy/core/tests/test_print.py2
-rw-r--r--numpy/core/tests/test_records.py2
-rw-r--r--numpy/core/tests/test_regression.py2
-rw-r--r--numpy/core/tests/test_scalarmath.py2
-rw-r--r--numpy/core/tests/test_scalarprint.py2
-rw-r--r--numpy/core/tests/test_shape_base.py2
-rw-r--r--numpy/core/tests/test_ufunc.py2
-rw-r--r--numpy/core/tests/test_umath.py2
-rw-r--r--numpy/core/tests/test_umath_complex.py2
-rw-r--r--numpy/core/tests/test_unicode.py2
54 files changed, 123 insertions, 123 deletions
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 011e356b2..f055d289e 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -1,36 +1,36 @@
-from __future__ import division
+from __future__ import division, absolute_import
-from info import __doc__
+from .info import __doc__
from numpy.version import version as __version__
-import multiarray
-import umath
-import _internal # for freeze programs
-import numerictypes as nt
+from . import multiarray
+from . import umath
+from . import _internal # for freeze programs
+from . import numerictypes as nt
multiarray.set_typeDict(nt.sctypeDict)
-import numeric
-from numeric import *
-import fromnumeric
-from fromnumeric import *
-import defchararray as char
-import records as rec
-from records import *
-from memmap import *
-from defchararray import chararray
-import scalarmath
-import function_base
-from function_base import *
-import machar
-from machar import *
-import getlimits
-from getlimits import *
-import shape_base
-from shape_base import *
+from . import numeric
+from .numeric import *
+from . import fromnumeric
+from .fromnumeric import *
+from . import defchararray as char
+from . import records as rec
+from .records import *
+from .memmap import *
+from .defchararray import chararray
+from . import scalarmath
+from . import function_base
+from .function_base import *
+from . import machar
+from .machar import *
+from . import getlimits
+from .getlimits import *
+from . import shape_base
+from .shape_base import *
del nt
-from fromnumeric import amax as max, amin as min, \
+from .fromnumeric import amax as max, amin as min, \
round_ as round
-from numeric import absolute as abs
+from .numeric import absolute as abs
__all__ = ['char','rec','memmap']
__all__ += numeric.__all__
diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py
index 6b448528e..ae7a81ca8 100644
--- a/numpy/core/_internal.py
+++ b/numpy/core/_internal.py
@@ -4,7 +4,7 @@ A place for code to be called from core C-code.
Some things are more easily handled Python.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import re
import sys
@@ -18,7 +18,7 @@ else:
_nbo = asbytes('>')
def _makenames_list(adict, align):
- from multiarray import dtype
+ from .multiarray import dtype
allfields = []
fnames = adict.keys()
for fname in fnames:
@@ -52,7 +52,7 @@ def _makenames_list(adict, align):
# a dictionary without "names" and "formats"
# fields is used as a data-type descriptor.
def _usefields(adict, align):
- from multiarray import dtype
+ from .multiarray import dtype
try:
names = adict[-1]
except KeyError:
@@ -130,7 +130,7 @@ def _array_descr(descriptor):
# so don't remove the name here, or you'll
# break backward compatibilty.
def _reconstruct(subtype, shape, dtype):
- from multiarray import ndarray
+ from .multiarray import ndarray
return ndarray.__new__(subtype, shape, dtype)
@@ -194,7 +194,7 @@ def _commastring(astr):
return result
def _getintp_ctype():
- from multiarray import dtype
+ from .multiarray import dtype
val = _getintp_ctype.cache
if val is not None:
return val
@@ -290,7 +290,7 @@ def _newnames(datatype, order):
# Given an array with fields and a sequence of field names
# construct a new array with just those fields copied over
def _index_fields(ary, fields):
- from multiarray import empty, dtype, array
+ from .multiarray import empty, dtype, array
dt = ary.dtype
names = [name for name in fields if name in dt.names]
diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py
index e0eaecb95..358d35ef1 100644
--- a/numpy/core/_methods.py
+++ b/numpy/core/_methods.py
@@ -3,7 +3,7 @@ Array methods which are called by the both the C-code for the method
and the Python code for the NumPy-namespace function
"""
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.core import multiarray as mu
from numpy.core import umath as um
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index c665cec0e..2675b0ea1 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -3,7 +3,7 @@
$Id: arrayprint.py,v 1.9 2005/09/13 13:58:44 teoliphant Exp $
"""
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ["array2string", "set_printoptions", "get_printoptions"]
__docformat__ = 'restructuredtext'
@@ -16,10 +16,10 @@ __docformat__ = 'restructuredtext'
# and by Travis Oliphant 2005-8-22 for numpy
import sys
-import numerictypes as _nt
-from umath import maximum, minimum, absolute, not_equal, isnan, isinf
-from multiarray import format_longfloat, datetime_as_string, datetime_data
-from fromnumeric import ravel
+from . import numerictypes as _nt
+from .umath import maximum, minimum, absolute, not_equal, isnan, isinf
+from .multiarray import format_longfloat, datetime_as_string, datetime_data
+from .fromnumeric import ravel
def product(x, y): return x*y
@@ -197,7 +197,7 @@ def get_printoptions():
return d
def _leading_trailing(a):
- import numeric as _nc
+ from . import numeric as _nc
if a.ndim == 1:
if len(a) > 2*_summaryEdgeItems:
b = _nc.concatenate((a[:_summaryEdgeItems],
@@ -324,7 +324,7 @@ def _array2string(a, max_line_width, precision, suppress_small, separator=' ',
return lst
def _convert_arrays(obj):
- import numeric as _nc
+ from . import numeric as _nc
newtup = []
for k in obj:
if isinstance(k, _nc.ndarray):
@@ -539,7 +539,7 @@ class FloatFormat(object):
pass
def fillFormat(self, data):
- import numeric as _nc
+ from . import numeric as _nc
errstate = _nc.seterr(all='ignore')
try:
special = isnan(data) | isinf(data)
@@ -592,7 +592,7 @@ class FloatFormat(object):
self.format = format
def __call__(self, x, strip_zeros=True):
- import numeric as _nc
+ from . import numeric as _nc
err = _nc.seterr(invalid='ignore')
try:
if isnan(x):
diff --git a/numpy/core/code_generators/__init__.py b/numpy/core/code_generators/__init__.py
index b06eaf1a4..52119d5cd 100644
--- a/numpy/core/code_generators/__init__.py
+++ b/numpy/core/code_generators/__init__.py
@@ -1 +1 @@
-from __future__ import division
+from __future__ import division, absolute_import
diff --git a/numpy/core/code_generators/cversions.py b/numpy/core/code_generators/cversions.py
index 161dae8d9..9f8a8fb34 100644
--- a/numpy/core/code_generators/cversions.py
+++ b/numpy/core/code_generators/cversions.py
@@ -3,12 +3,12 @@
The API has is defined by numpy_api_order and ufunc_api_order.
"""
-from __future__ import division
+from __future__ import division, absolute_import
from os.path import dirname
-from genapi import fullapi_hash
-import numpy_api
+from .genapi import fullapi_hash
+from . import numpy_api
if __name__ == '__main__':
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
index a1fb9e641..3855d5a3d 100644
--- a/numpy/core/code_generators/genapi.py
+++ b/numpy/core/code_generators/genapi.py
@@ -6,7 +6,7 @@ See ``find_function`` for how functions should be formatted, and
specified.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys, os, re
try:
diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
index 4a9c747ea..35c8ab496 100644
--- a/numpy/core/code_generators/numpy_api.py
+++ b/numpy/core/code_generators/numpy_api.py
@@ -12,7 +12,7 @@ When adding a function, make sure to use the next integer not used as an index
exception, so it should hopefully not get unnoticed).
"""
-from __future__ import division
+from __future__ import division, absolute_import
multiarray_global_vars = {
'NPY_NUMUSERTYPES': 7,
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index 8e175160e..ff947acb8 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -9,7 +9,7 @@ for the ufuncs in numpy.core at the C level when the ufuncs are created
at compile time.
"""
-from __future__ import division
+from __future__ import division, absolute_import
docdict = {}
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py
index c85d95c49..3f0a730ad 100644
--- a/numpy/core/defchararray.py
+++ b/numpy/core/defchararray.py
@@ -15,12 +15,12 @@ available in your version of Python.
The preferred alias for `defchararray` is `numpy.char`.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys
-from numerictypes import string_, unicode_, integer, object_, bool_, character
-from numeric import ndarray, compare_chararrays
-from numeric import array as narray
+from .numerictypes import string_, unicode_, integer, object_, bool_, character
+from .numeric import ndarray, compare_chararrays
+from .numeric import array as narray
from numpy.core.multiarray import _vec_string
from numpy.compat import asbytes
import numpy
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 9ca56ce27..0080c38ce 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -1,7 +1,7 @@
"""Module containing non-deprecated functions borrowed from Numeric.
"""
-from __future__ import division
+from __future__ import division, absolute_import
__docformat__ = "restructuredtext en"
@@ -16,11 +16,11 @@ __all__ = ['take', 'reshape', 'choose', 'repeat', 'put',
'amax', 'amin',
]
-import multiarray as mu
-import umath as um
-import numerictypes as nt
-from numeric import asarray, array, asanyarray, concatenate
-import _methods
+from . import multiarray as mu
+from . import umath as um
+from . import numerictypes as nt
+from .numeric import asarray, array, asanyarray, concatenate
+from . import _methods
_dt_ = nt.sctype2char
import types
diff --git a/numpy/core/function_base.py b/numpy/core/function_base.py
index fa6732077..4a757b931 100644
--- a/numpy/core/function_base.py
+++ b/numpy/core/function_base.py
@@ -1,9 +1,9 @@
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['logspace', 'linspace']
-import numeric as _nx
-from numeric import array
+from . import numeric as _nx
+from .numeric import array
def linspace(start, stop, num=50, endpoint=True, retstep=False):
"""
diff --git a/numpy/core/getlimits.py b/numpy/core/getlimits.py
index 7b94346c7..606038677 100644
--- a/numpy/core/getlimits.py
+++ b/numpy/core/getlimits.py
@@ -1,14 +1,14 @@
"""Machine limits for Float32 and Float64 and (long double) if available...
"""
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['finfo','iinfo']
-from machar import MachAr
-import numeric
-import numerictypes as ntypes
-from numeric import array
+from .machar import MachAr
+from . import numeric
+from . import numerictypes as ntypes
+from .numeric import array
def _frz(a):
"""fix rank-0 --> rank-1"""
diff --git a/numpy/core/info.py b/numpy/core/info.py
index f56b2d395..7152e4aca 100644
--- a/numpy/core/info.py
+++ b/numpy/core/info.py
@@ -81,7 +81,7 @@ More Functions:
arccosh arcsinh arctanh
"""
-from __future__ import division
+from __future__ import division, absolute_import
depends = ['testing']
global_symbols = ['*']
diff --git a/numpy/core/machar.py b/numpy/core/machar.py
index d44d17499..1053570f8 100644
--- a/numpy/core/machar.py
+++ b/numpy/core/machar.py
@@ -5,7 +5,7 @@ floating-point arithmetic system
Author: Pearu Peterson, September 2003
"""
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['MachAr']
diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py
index 5107e9b28..528951537 100644
--- a/numpy/core/memmap.py
+++ b/numpy/core/memmap.py
@@ -1,9 +1,9 @@
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['memmap']
import warnings
-from numeric import uint8, ndarray, dtype
+from .numeric import uint8, ndarray, dtype
import sys
import numpy as np
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 57e366efb..5c5d1a0da 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc',
'arange', 'array', 'zeros', 'count_nonzero',
@@ -26,11 +26,11 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc',
import sys
import warnings
-import multiarray
-import umath
-from umath import *
-import numerictypes
-from numerictypes import *
+from . import multiarray
+from . import umath
+from .umath import *
+from . import numerictypes
+from .numerictypes import *
import collections
@@ -911,7 +911,7 @@ def outer(a,b):
try:
# importing this changes the dot function for basic 4 types
# to blas-optimized versions.
- from _dotblas import dot, vdot, inner, alterdot, restoredot
+ from ._dotblas import dot, vdot, inner, alterdot, restoredot
except ImportError:
# docstrings are in add_newdocs.py
inner = multiarray.inner
@@ -1364,7 +1364,7 @@ def cross(a, b, axisa=-1, axisb=-1, axisc=-1, axis=None):
#Use numarray's printing function
-from arrayprint import array2string, get_printoptions, set_printoptions
+from .arrayprint import array2string, get_printoptions, set_printoptions
_typelessdata = [int_, float_, complex_]
if issubclass(intc, int):
@@ -2591,6 +2591,6 @@ nan = NaN = NAN
False_ = bool_(False)
True_ = bool_(True)
-import fromnumeric
-from fromnumeric import *
+from . import fromnumeric
+from .fromnumeric import *
extend_all(fromnumeric)
diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py
index f89fa994d..a1af9d80d 100644
--- a/numpy/core/numerictypes.py
+++ b/numpy/core/numerictypes.py
@@ -80,7 +80,7 @@ Exported symbols include:
\\-> object_ (not used much) (kind=O)
"""
-from __future__ import division
+from __future__ import division, absolute_import
# we add more at the bottom
__all__ = ['sctypeDict', 'sctypeNA', 'typeDict', 'typeNA', 'sctypes',
diff --git a/numpy/core/records.py b/numpy/core/records.py
index 761b1015a..385f9866d 100644
--- a/numpy/core/records.py
+++ b/numpy/core/records.py
@@ -34,14 +34,14 @@ Record arrays allow us to access fields as properties::
array([ 2., 2.])
"""
-from __future__ import division
+from __future__ import division, absolute_import
# All of the functions allow formats to be a dtype
__all__ = ['record', 'recarray', 'format_parser']
-import numeric as sb
-from defchararray import chararray
-import numerictypes as nt
+from . import numeric as sb
+from .defchararray import chararray
+from . import numerictypes as nt
import types
import os
import sys
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 1afc71085..056cf9ec0 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
# Code common to build tools
import sys
diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py
index 4d5439249..d7e86f64e 100644
--- a/numpy/core/shape_base.py
+++ b/numpy/core/shape_base.py
@@ -1,9 +1,9 @@
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack']
-import numeric as _nx
-from numeric import array, asanyarray, newaxis
+from . import numeric as _nx
+from .numeric import array, asanyarray, newaxis
def atleast_1d(*arys):
"""
diff --git a/numpy/core/src/multiarray/testcalcs.py b/numpy/core/src/multiarray/testcalcs.py
index 78a875406..d4b39cb4a 100644
--- a/numpy/core/src/multiarray/testcalcs.py
+++ b/numpy/core/src/multiarray/testcalcs.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from scipy import weave
diff --git a/numpy/core/tests/test_api.py b/numpy/core/tests/test_api.py
index 484b6afbd..92e7d936c 100644
--- a/numpy/core/tests/test_api.py
+++ b/numpy/core/tests/test_api.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py
index a61aa5161..e286aea07 100644
--- a/numpy/core/tests/test_arrayprint.py
+++ b/numpy/core/tests/test_arrayprint.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import numpy as np
diff --git a/numpy/core/tests/test_blasdot.py b/numpy/core/tests/test_blasdot.py
index d6abacfc1..1dd56fddd 100644
--- a/numpy/core/tests/test_blasdot.py
+++ b/numpy/core/tests/test_blasdot.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
import sys
diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py
index 03ee20b09..eecbfe75b 100644
--- a/numpy/core/tests/test_datetime.py
+++ b/numpy/core/tests/test_datetime.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import os, pickle
import numpy
diff --git a/numpy/core/tests/test_defchararray.py b/numpy/core/tests/test_defchararray.py
index ed928bce1..d75955075 100644
--- a/numpy/core/tests/test_defchararray.py
+++ b/numpy/core/tests/test_defchararray.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import *
from numpy.core import *
diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py
index c7cc9d413..6a248b5cf 100644
--- a/numpy/core/tests/test_deprecations.py
+++ b/numpy/core/tests/test_deprecations.py
@@ -3,7 +3,7 @@ Tests related to deprecation warnings. Also a convenient place
to document how deprecations should eventually be turned into errors.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import warnings
diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py
index a08cf4851..804c1cf2c 100644
--- a/numpy/core/tests/test_dtype.py
+++ b/numpy/core/tests/test_dtype.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import numpy as np
diff --git a/numpy/core/tests/test_einsum.py b/numpy/core/tests/test_einsum.py
index 4fba533db..ed7d455dc 100644
--- a/numpy/core/tests/test_einsum.py
+++ b/numpy/core/tests/test_einsum.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
from decimal import Decimal
diff --git a/numpy/core/tests/test_errstate.py b/numpy/core/tests/test_errstate.py
index c7c5a13ce..04acafbc9 100644
--- a/numpy/core/tests/test_errstate.py
+++ b/numpy/core/tests/test_errstate.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import platform
diff --git a/numpy/core/tests/test_function_base.py b/numpy/core/tests/test_function_base.py
index 914ffbb14..345e326c2 100644
--- a/numpy/core/tests/test_function_base.py
+++ b/numpy/core/tests/test_function_base.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import *
from numpy import logspace, linspace
diff --git a/numpy/core/tests/test_getlimits.py b/numpy/core/tests/test_getlimits.py
index 5d5d9bc44..794d9d0b7 100644
--- a/numpy/core/tests/test_getlimits.py
+++ b/numpy/core/tests/test_getlimits.py
@@ -1,7 +1,7 @@
""" Test functions for limits module.
"""
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import *
diff --git a/numpy/core/tests/test_half.py b/numpy/core/tests/test_half.py
index ed1b3e5dd..a6a3cd05c 100644
--- a/numpy/core/tests/test_half.py
+++ b/numpy/core/tests/test_half.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import platform
diff --git a/numpy/core/tests/test_indexerrors.py b/numpy/core/tests/test_indexerrors.py
index 2d74d2ef3..5ab9b5aef 100644
--- a/numpy/core/tests/test_indexerrors.py
+++ b/numpy/core/tests/test_indexerrors.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.testing import TestCase, run_module_suite, assert_raises, assert_equal, assert_
diff --git a/numpy/core/tests/test_indexing.py b/numpy/core/tests/test_indexing.py
index 6b8b7b8a8..530fd5583 100644
--- a/numpy/core/tests/test_indexing.py
+++ b/numpy/core/tests/test_indexing.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.compat import asbytes
diff --git a/numpy/core/tests/test_item_selection.py b/numpy/core/tests/test_item_selection.py
index ab10b476c..d2282e52a 100644
--- a/numpy/core/tests/test_item_selection.py
+++ b/numpy/core/tests/test_item_selection.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.testing import *
diff --git a/numpy/core/tests/test_machar.py b/numpy/core/tests/test_machar.py
index 1d2c42110..659902d84 100644
--- a/numpy/core/tests/test_machar.py
+++ b/numpy/core/tests/test_machar.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import *
diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py
index 5daeaa279..01c804933 100644
--- a/numpy/core/tests/test_memmap.py
+++ b/numpy/core/tests/test_memmap.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
from tempfile import NamedTemporaryFile, mktemp
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index a9a79d38c..f4f51b414 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import tempfile
import sys
diff --git a/numpy/core/tests/test_multiarray_assignment.py b/numpy/core/tests/test_multiarray_assignment.py
index d5e506249..c47979b4d 100644
--- a/numpy/core/tests/test_multiarray_assignment.py
+++ b/numpy/core/tests/test_multiarray_assignment.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.testing import TestCase
diff --git a/numpy/core/tests/test_nditer.py b/numpy/core/tests/test_nditer.py
index 219629191..ebbe25fd3 100644
--- a/numpy/core/tests/test_nditer.py
+++ b/numpy/core/tests/test_nditer.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy import array, arange, nditer, all
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index 6d3cbe923..047070cce 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import platform
diff --git a/numpy/core/tests/test_numerictypes.py b/numpy/core/tests/test_numerictypes.py
index f00aee453..77fe2daf2 100644
--- a/numpy/core/tests/test_numerictypes.py
+++ b/numpy/core/tests/test_numerictypes.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/core/tests/test_print.py b/numpy/core/tests/test_print.py
index 3b9025d10..67021c20e 100644
--- a/numpy/core/tests/test_print.py
+++ b/numpy/core/tests/test_print.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.testing import *
diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
index 57d128b11..fa5877538 100644
--- a/numpy/core/tests/test_records.py
+++ b/numpy/core/tests/test_records.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from os import path
import numpy as np
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
index 69138647e..19c15b32f 100644
--- a/numpy/core/tests/test_regression.py
+++ b/numpy/core/tests/test_regression.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import pickle
import sys
diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index 03b90af79..3078c583b 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.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/core/tests/test_scalarprint.py b/numpy/core/tests/test_scalarprint.py
index 3f791e12d..80f5ab622 100644
--- a/numpy/core/tests/test_scalarprint.py
+++ b/numpy/core/tests/test_scalarprint.py
@@ -2,7 +2,7 @@
""" Test printing of scalar types.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import numpy as np
from numpy.testing import TestCase, assert_, run_module_suite
diff --git a/numpy/core/tests/test_shape_base.py b/numpy/core/tests/test_shape_base.py
index e0c8197de..cc2ff9d17 100644
--- a/numpy/core/tests/test_shape_base.py
+++ b/numpy/core/tests/test_shape_base.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import warnings
import numpy as np
diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py
index 963b2aae7..16ae9f50c 100644
--- a/numpy/core/tests/test_ufunc.py
+++ b/numpy/core/tests/test_ufunc.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index 244ba59a5..cbad84bfc 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import platform
diff --git a/numpy/core/tests/test_umath_complex.py b/numpy/core/tests/test_umath_complex.py
index 34977e683..a1368bccd 100644
--- a/numpy/core/tests/test_umath_complex.py
+++ b/numpy/core/tests/test_umath_complex.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import platform
diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py
index 8941f8e82..17a3c386b 100644
--- a/numpy/core/tests/test_unicode.py
+++ b/numpy/core/tests/test_unicode.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys