9 files changed, 12 insertions, 12 deletions
diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py
index ed281abee..d0a5de983 100644
--- a/numpy/linalg/__init__.py
+++ b/numpy/linalg/__init__.py
@@ -42,12 +42,12 @@ LinAlgError     Indicates a failed linear algebra operation
 =============== ==========================================================
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 # To get sub-modules
-from info import __doc__
+from .info import __doc__
 
-from linalg import *
+from .linalg import *
 
 from numpy.testing import Tester
 test = Tester().test
diff --git a/numpy/linalg/info.py b/numpy/linalg/info.py
index 45b91db18..14d9ab1f7 100644
--- a/numpy/linalg/info.py
+++ b/numpy/linalg/info.py
@@ -32,6 +32,6 @@ Exceptions:
 - LinAlgError     Indicates a failed linear algebra operation
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 depends = ['core']
diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py
index 10ee543b9..22f818e91 100644
--- a/numpy/linalg/lapack_lite/clapack_scrub.py
+++ b/numpy/linalg/lapack_lite/clapack_scrub.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2.4
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys, os
 from cStringIO import StringIO
diff --git a/numpy/linalg/lapack_lite/fortran.py b/numpy/linalg/lapack_lite/fortran.py
index 6fff72312..6aad0ba8c 100644
--- a/numpy/linalg/lapack_lite/fortran.py
+++ b/numpy/linalg/lapack_lite/fortran.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import re
 import itertools
diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py
index 1fea7c049..7e48a5a37 100755
--- a/numpy/linalg/lapack_lite/make_lite.py
+++ b/numpy/linalg/lapack_lite/make_lite.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys, os
 import fortran
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 167e733fd..c66ab8c3a 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -8,7 +8,7 @@ version only accesses the following LAPACK functions: dgesv, zgesv,
 dgeev, zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf,
 zgetrf, dpotrf, zpotrf, dgeqrf, zgeqrf, zungqr, dorgqr.
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 
 __all__ = ['matrix_power', 'solve', 'tensorsolve', 'tensorinv', 'inv',
@@ -226,7 +226,7 @@ def tensorsolve(a, b, axes=None):
     an = a.ndim
 
     if axes is not None:
-        allaxes = range(0, an)
+        allaxes = list(range(0, an))
         for k in axes:
             allaxes.remove(k)
             allaxes.insert(an, k)
diff --git a/numpy/linalg/tests/test_build.py b/numpy/linalg/tests/test_build.py
index 4a151d3f4..0e7dc3629 100644
--- a/numpy/linalg/tests/test_build.py
+++ b/numpy/linalg/tests/test_build.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from subprocess import call, PIPE, Popen
 import sys
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index fb8f89fe9..6750f059d 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -1,6 +1,6 @@
 """ Test functions for linalg module
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 
diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py
index 9ca56e9ff..c3e01c383 100644
--- a/numpy/linalg/tests/test_regression.py
+++ b/numpy/linalg/tests/test_regression.py
@@ -1,6 +1,6 @@
 """ Test functions for linalg module
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 
 from numpy.testing import *