18 files changed, 31 insertions, 31 deletions
diff --git a/numpy/numarray/__init__.py b/numpy/numarray/__init__.py
index 964ee2baa..f7a487cdf 100644
--- a/numpy/numarray/__init__.py
+++ b/numpy/numarray/__init__.py
@@ -1,18 +1,18 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
-from util import *
-from numerictypes import *
-from functions import *
-from ufuncs import *
-from compat import *
-from session import *
+from .util import *
+from .numerictypes import *
+from .functions import *
+from .ufuncs import *
+from .compat import *
+from .session import *
 
-import util
-import numerictypes
-import functions
-import ufuncs
-import compat
-import session
+from . import util
+from . import numerictypes
+from . import functions
+from . import ufuncs
+from . import compat
+from . import session
 
 __all__ = ['session', 'numerictypes']
 __all__ += util.__all__
diff --git a/numpy/numarray/alter_code1.py b/numpy/numarray/alter_code1.py
index 2393aff5a..09370549d 100644
--- a/numpy/numarray/alter_code1.py
+++ b/numpy/numarray/alter_code1.py
@@ -52,7 +52,7 @@ Makes the following changes:
    - .setimaginary() --> .imag
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
diff --git a/numpy/numarray/alter_code2.py b/numpy/numarray/alter_code2.py
index 4d76222da..df248a924 100644
--- a/numpy/numarray/alter_code2.py
+++ b/numpy/numarray/alter_code2.py
@@ -5,7 +5,7 @@ with numpy
 FIXME:  finish this.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = []
 
diff --git a/numpy/numarray/compat.py b/numpy/numarray/compat.py
index 794a2d591..24e20be17 100644
--- a/numpy/numarray/compat.py
+++ b/numpy/numarray/compat.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['NewAxis', 'ArrayType']
 
diff --git a/numpy/numarray/convolve.py b/numpy/numarray/convolve.py
index 14c16f008..af7330fc7 100644
--- a/numpy/numarray/convolve.py
+++ b/numpy/numarray/convolve.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 try:
     from stsci.convolve import *
diff --git a/numpy/numarray/fft.py b/numpy/numarray/fft.py
index 158c8807e..4adf1d3bb 100644
--- a/numpy/numarray/fft.py
+++ b/numpy/numarray/fft.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.oldnumeric.fft import *
 import numpy.oldnumeric.fft as nof
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py
index 2e12a4149..2492d5f3f 100644
--- a/numpy/numarray/functions.py
+++ b/numpy/numarray/functions.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 # missing Numarray defined names (in from numarray import *)
 
@@ -40,7 +40,7 @@ from numpy import dot as matrixmultiply, dot, vdot, ravel, concatenate, all,\
      resize, searchsorted, shape, size, sort, swapaxes, trace, transpose
 import numpy as np
 
-from numerictypes import typefrom
+from .numerictypes import typefrom
 
 if sys.version_info[0] >= 3:
     import copyreg as copy_reg
diff --git a/numpy/numarray/image.py b/numpy/numarray/image.py
index 112fdac9e..bcfa09afd 100644
--- a/numpy/numarray/image.py
+++ b/numpy/numarray/image.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 try:
     from stsci.image import *
diff --git a/numpy/numarray/linear_algebra.py b/numpy/numarray/linear_algebra.py
index 1c716e05b..3b92d09d1 100644
--- a/numpy/numarray/linear_algebra.py
+++ b/numpy/numarray/linear_algebra.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.oldnumeric.linear_algebra import *
 
diff --git a/numpy/numarray/ma.py b/numpy/numarray/ma.py
index 2b820a98d..f220362ae 100644
--- a/numpy/numarray/ma.py
+++ b/numpy/numarray/ma.py
@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.oldnumeric.ma import *
diff --git a/numpy/numarray/matrix.py b/numpy/numarray/matrix.py
index 723613c63..bd10f8278 100644
--- a/numpy/numarray/matrix.py
+++ b/numpy/numarray/matrix.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['Matrix']
 
diff --git a/numpy/numarray/mlab.py b/numpy/numarray/mlab.py
index 70ccf077a..d530c8a05 100644
--- a/numpy/numarray/mlab.py
+++ b/numpy/numarray/mlab.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.oldnumeric.mlab import *
 import numpy.oldnumeric.mlab as nom
diff --git a/numpy/numarray/nd_image.py b/numpy/numarray/nd_image.py
index a9a7ee1f4..d73788ed3 100644
--- a/numpy/numarray/nd_image.py
+++ b/numpy/numarray/nd_image.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 try:
     from ndimage import *
diff --git a/numpy/numarray/numerictypes.py b/numpy/numarray/numerictypes.py
index ef1ccb2a3..b51706ec3 100644
--- a/numpy/numarray/numerictypes.py
+++ b/numpy/numarray/numerictypes.py
@@ -27,7 +27,7 @@ Exported symbols include:
 $Id: numerictypes.py,v 1.55 2005/12/01 16:22:03 jaytmiller Exp $
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 
 __all__ = ['NumericType','HasUInt64','typeDict','IsType',
diff --git a/numpy/numarray/random_array.py b/numpy/numarray/random_array.py
index 654f58346..6f56e9cf9 100644
--- a/numpy/numarray/random_array.py
+++ b/numpy/numarray/random_array.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['ArgumentError', 'F', 'beta', 'binomial', 'chi_square',
            'exponential', 'gamma', 'get_seed', 'multinomial',
diff --git a/numpy/numarray/session.py b/numpy/numarray/session.py
index fab80a1e2..32a28cca0 100644
--- a/numpy/numarray/session.py
+++ b/numpy/numarray/session.py
@@ -72,7 +72,7 @@ Saved modules are re-imported at load time but any "state" in the module
 which is not restored by a simple import is lost.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['load', 'save']
 
diff --git a/numpy/numarray/ufuncs.py b/numpy/numarray/ufuncs.py
index 357972c79..a5b72c3fb 100644
--- a/numpy/numarray/ufuncs.py
+++ b/numpy/numarray/ufuncs.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh',
            'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_not',
diff --git a/numpy/numarray/util.py b/numpy/numarray/util.py
index 819987cbf..acdb18fc8 100644
--- a/numpy/numarray/util.py
+++ b/numpy/numarray/util.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import numpy as np