19 files changed, 43 insertions, 7 deletions
diff --git a/numpy/lib/tests/test__datasource.py b/numpy/lib/tests/test__datasource.py
index 3f8697507..f025b947e 100644
--- a/numpy/lib/tests/test__datasource.py
+++ b/numpy/lib/tests/test__datasource.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import os
 from tempfile import mkdtemp, mkstemp, NamedTemporaryFile
 from shutil import rmtree
diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py
index a0f1546e2..6416b6d7a 100644
--- a/numpy/lib/tests/test__iotools.py
+++ b/numpy/lib/tests/test__iotools.py
@@ -1,4 +1,7 @@
+from __future__ import division
+
 import sys
+
 if sys.version_info[0] >= 3:
     from io import BytesIO
     def StringIO(s=""):
diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py
index 01cb5be4c..e70c06aeb 100644
--- a/numpy/lib/tests/test_arraypad.py
+++ b/numpy/lib/tests/test_arraypad.py
@@ -1,6 +1,7 @@
-'''
-Tests for the pad functions.
-'''
+"""Tests for the pad functions.
+
+"""
+from __future__ import division
 
 from numpy.testing import TestCase, run_module_suite, assert_array_equal
 from numpy.testing import assert_raises, assert_array_almost_equal
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py
index 5f4f10c76..cab7a86b1 100644
--- a/numpy/lib/tests/test_arraysetops.py
+++ b/numpy/lib/tests/test_arraysetops.py
@@ -1,6 +1,7 @@
-""" Test functions for 1D array set operations.
+"""Test functions for 1D array set operations.
 
 """
+from __future__ import division
 
 from numpy.testing import *
 import numpy as np
diff --git a/numpy/lib/tests/test_arrayterator.py b/numpy/lib/tests/test_arrayterator.py
index c1c59ba31..5064ab496 100644
--- a/numpy/lib/tests/test_arrayterator.py
+++ b/numpy/lib/tests/test_arrayterator.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from operator import mul
 
 import numpy as np
diff --git a/numpy/lib/tests/test_financial.py b/numpy/lib/tests/test_financial.py
index 5fe976143..e06c50ef6 100644
--- a/numpy/lib/tests/test_financial.py
+++ b/numpy/lib/tests/test_financial.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 import numpy as np
 
diff --git a/numpy/lib/tests/test_format.py b/numpy/lib/tests/test_format.py
index 213d69760..320cef3d2 100644
--- a/numpy/lib/tests/test_format.py
+++ b/numpy/lib/tests/test_format.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 r''' Test the .npy file format.
 
 Set up:
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index 49544b22b..25c498312 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import warnings
 import numpy as np
 from numpy.testing import (
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index a6e65ef56..2b42fdc2c 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 import numpy as np
 from numpy import ( array, ones, r_, mgrid, unravel_index, zeros, where,
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index b7fa94448..f1088ebb5 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import sys
 import gzip
 import os
diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py
index 3c69cb93b..fc2b49c81 100644
--- a/numpy/lib/tests/test_polynomial.py
+++ b/numpy/lib/tests/test_polynomial.py
@@ -1,4 +1,6 @@
-"""
+from __future__ import division
+
+'''
 >>> p = np.poly1d([1.,2,3])
 >>> p
 poly1d([ 1.,  2.,  3.])
@@ -74,8 +76,8 @@ poly1d([ 2.])
 
 >>> np.polydiv(np.poly1d([1,0,-1]), np.poly1d([1,1]))
 (poly1d([ 1., -1.]), poly1d([ 0.]))
-"""
 
+'''
 from numpy.testing import *
 import numpy as np
 
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py
index 3d2d1e983..6a0ad1609 100644
--- a/numpy/lib/tests/test_recfunctions.py
+++ b/numpy/lib/tests/test_recfunctions.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import sys
 
 import numpy as np
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py
index 270da73e3..e0a3a424d 100644
--- a/numpy/lib/tests/test_regression.py
+++ b/numpy/lib/tests/test_regression.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 from numpy.testing.utils import _assert_valid_refcount
 import numpy as np
diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py
index 56178e8af..70c4d33ac 100644
--- a/numpy/lib/tests/test_shape_base.py
+++ b/numpy/lib/tests/test_shape_base.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 from numpy.lib import *
 from numpy.core import *
diff --git a/numpy/lib/tests/test_stride_tricks.py b/numpy/lib/tests/test_stride_tricks.py
index 814f2d614..0ac1c279b 100644
--- a/numpy/lib/tests/test_stride_tricks.py
+++ b/numpy/lib/tests/test_stride_tricks.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import numpy as np
 from numpy.testing import *
 from numpy.lib.stride_tricks import broadcast_arrays
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 7e7900090..702f9a6f5 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -1,6 +1,7 @@
-""" Test functions for matrix module
+"""Test functions for matrix module
 
 """
+from __future__ import division
 
 from numpy.testing import *
 
diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py
index 0f8927614..c4f4a6299 100644
--- a/numpy/lib/tests/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 from numpy.lib import *
 from numpy.core import *
diff --git a/numpy/lib/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py
index 29b47f257..0f688b021 100644
--- a/numpy/lib/tests/test_ufunclike.py
+++ b/numpy/lib/tests/test_ufunclike.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 import numpy.core as nx
 import numpy.lib.ufunclike as ufl
diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py
index 80f90f04b..534806ff2 100644
--- a/numpy/lib/tests/test_utils.py
+++ b/numpy/lib/tests/test_utils.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 import numpy.lib.utils as utils
 from numpy.lib import deprecate