7 files changed, 17 insertions, 1 deletions
diff --git a/numpy/matrixlib/__init__.py b/numpy/matrixlib/__init__.py
index 468a8829d..dc9a6bca9 100644
--- a/numpy/matrixlib/__init__.py
+++ b/numpy/matrixlib/__init__.py
@@ -1,4 +1,8 @@
-"""Sub-package containing the matrix class and related functions."""
+"""Sub-package containing the matrix class and related functions.
+
+"""
+from __future__ import division
+
 from defmatrix import *
 
 __all__ = defmatrix.__all__
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py
index dbf2909fd..f0299ee88 100644
--- a/numpy/matrixlib/defmatrix.py
+++ b/numpy/matrixlib/defmatrix.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['matrix', 'bmat', 'mat', 'asmatrix']
 
 import sys
diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py
index 85b090094..539e62a7f 100644
--- a/numpy/matrixlib/setup.py
+++ b/numpy/matrixlib/setup.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import division
+
 import os
 
 def configuration(parent_package='', top_path=None):
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index dd0b9ee08..74c379d77 100644
--- a/numpy/matrixlib/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 from numpy.core import *
 from numpy import matrix, asmatrix, bmat
diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py
index 9ef105aa3..6247a1c48 100644
--- a/numpy/matrixlib/tests/test_multiarray.py
+++ b/numpy/matrixlib/tests/test_multiarray.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 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 0b96bb05a..5539dac0d 100644
--- a/numpy/matrixlib/tests/test_numeric.py
+++ b/numpy/matrixlib/tests/test_numeric.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import assert_equal, TestCase
 from numpy.core import ones
 from numpy import matrix
diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py
index ba0133dfd..ae352f09c 100644
--- a/numpy/matrixlib/tests/test_regression.py
+++ b/numpy/matrixlib/tests/test_regression.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 import numpy as np