summaryrefslogtreecommitdiff
path: root/numpy/matrixlib
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/matrixlib')
-rw-r--r--numpy/matrixlib/__init__.py4
-rw-r--r--numpy/matrixlib/defmatrix.py2
-rw-r--r--numpy/matrixlib/tests/test_defmatrix.py2
-rw-r--r--numpy/matrixlib/tests/test_multiarray.py2
-rw-r--r--numpy/matrixlib/tests/test_numeric.py2
-rw-r--r--numpy/matrixlib/tests/test_regression.py2
6 files changed, 7 insertions, 7 deletions
diff --git a/numpy/matrixlib/__init__.py b/numpy/matrixlib/__init__.py
index dc9a6bca9..bb826cd39 100644
--- a/numpy/matrixlib/__init__.py
+++ b/numpy/matrixlib/__init__.py
@@ -1,9 +1,9 @@
"""Sub-package containing the matrix class and related functions.
"""
-from __future__ import division
+from __future__ import division, absolute_import
-from defmatrix import *
+from .defmatrix import *
__all__ = defmatrix.__all__
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py
index f0299ee88..cf47fadf8 100644
--- a/numpy/matrixlib/defmatrix.py
+++ b/numpy/matrixlib/defmatrix.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['matrix', 'bmat', 'mat', 'asmatrix']
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index 28b563977..c67b447b8 100644
--- a/numpy/matrixlib/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.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/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py
index 6247a1c48..d58adb3a2 100644
--- a/numpy/matrixlib/tests/test_multiarray.py
+++ b/numpy/matrixlib/tests/test_multiarray.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/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py
index 5539dac0d..7b690fbef 100644
--- a/numpy/matrixlib/tests/test_numeric.py
+++ b/numpy/matrixlib/tests/test_numeric.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import assert_equal, TestCase
from numpy.core import ones
diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py
index ae352f09c..da5131bc6 100644
--- a/numpy/matrixlib/tests/test_regression.py
+++ b/numpy/matrixlib/tests/test_regression.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
from numpy.testing import *
import numpy as np