2to3: Put `from __future__ import division in every python file.

This should be harmless, as we already are division clean. However,
placement of this import takes some care. In the future a script
can be used to append new features without worry, at least until
such time as it exceeds a single line. Having that ability will
make it easier to deal with absolute imports and printing updates.

42 files changed, 97 insertions, 17 deletions

diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
index 17557605d..5679a2dc8 100644
--- a/numpy/lib/__init__.py
+++ b/numpy/lib/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from info import __doc__
 from numpy.version import version as __version__
 
diff --git a/numpy/lib/_datasource.py b/numpy/lib/_datasource.py
index 390c56d36..d5424e8d3 100644
--- a/numpy/lib/_datasource.py
+++ b/numpy/lib/_datasource.py
@@ -31,6 +31,7 @@ Example::
     >>> fp.close()
 
 """
+from __future__ import division
 
 __docformat__ = "restructuredtext en"
 
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py
index 2f2a4bc57..aa3744204 100644
--- a/numpy/lib/_iotools.py
+++ b/numpy/lib/_iotools.py
@@ -1,4 +1,8 @@
-"""A collection of functions designed to help I/O with ascii files."""
+"""A collection of functions designed to help I/O with ascii files.
+
+"""
+from __future__ import division
+
 __docformat__ = "restructuredtext en"
 
 import sys
diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py
index 6212ac7f3..e6ebd97e4 100644
--- a/numpy/lib/arraypad.py
+++ b/numpy/lib/arraypad.py
@@ -1,7 +1,9 @@
 """
 The arraypad module contains a group of functions to pad values onto the edges
 of an n-dimensional array.
+
 """
+from __future__ import division
 
 import numpy as np
 
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
index ae14970e2..61bb81721 100644
--- a/numpy/lib/arraysetops.py
+++ b/numpy/lib/arraysetops.py
@@ -22,7 +22,10 @@ thus calls to argsort().
 To do: Optionally return indices analogously to unique for all functions.
 
 :Author: Robert Cimrman
+
 """
+from __future__ import division
+
 __all__ = ['ediff1d', 'intersect1d', 'setxor1d', 'union1d', 'setdiff1d',
            'unique', 'in1d']
 
diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py
index 2df05e514..6f6953a22 100644
--- a/numpy/lib/arrayterator.py
+++ b/numpy/lib/arrayterator.py
@@ -7,7 +7,6 @@ an array object, and when iterated it will return sub-arrays with at most
 a user-specified number of elements.
 
 """
-
 from __future__ import division
 
 from operator import mul
diff --git a/numpy/lib/financial.py b/numpy/lib/financial.py
index 599a36198..5887a9224 100644
--- a/numpy/lib/financial.py
+++ b/numpy/lib/financial.py
@@ -1,10 +1,15 @@
-# Some simple financial calculations
-#  patterned after spreadsheet computations.
+"""Some simple financial calculations
+
+patterned after spreadsheet computations.
+
+There is some complexity in each function
+so that the functions behave like ufuncs with
+broadcasting and being able to be called with scalars
+or arrays (or other sequences).
+
+"""
+from __future__ import division
 
-# There is some complexity in each function
-#  so that the functions behave like ufuncs with
-#  broadcasting and being able to be called with scalars
-#  or arrays (or other sequences).
 import numpy as np
 
 __all__ = ['fv', 'pmt', 'nper', 'ipmt', 'ppmt', 'pv', 'rate',
diff --git a/numpy/lib/format.py b/numpy/lib/format.py
index bff582f7d..9a558f40c 100644
--- a/numpy/lib/format.py
+++ b/numpy/lib/format.py
@@ -134,6 +134,7 @@ The ``.npy`` format, including reasons for creating it and a comparison of
 alternatives, is described fully in the "npy-format" NEP.
 
 """
+from __future__ import division
 
 import cPickle
 
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 6acd9a36b..cd79dd67f 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __docformat__ = "restructuredtext en"
 __all__ = ['select', 'piecewise', 'trim_zeros', 'copy', 'iterable',
            'percentile', 'diff', 'gradient', 'angle', 'unwrap', 'sort_complex',
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index 15a1a559d..9c58bf747 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['ravel_multi_index',
            'unravel_index',
            'mgrid',
diff --git a/numpy/lib/info.py b/numpy/lib/info.py
index 4a781a2ca..1a2154951 100644
--- a/numpy/lib/info.py
+++ b/numpy/lib/info.py
@@ -145,6 +145,7 @@ setdiff1d        Set difference of 1D arrays with unique elements.
 ================ ===================
 
 """
+from __future__ import division
 
 depends = ['core','testing']
 global_symbols = ['*']
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index b63003f80..ca410a24a 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['savetxt', 'loadtxt', 'genfromtxt', 'ndfromtxt', 'mafromtxt',
            'recfromtxt', 'recfromcsv', 'load', 'loads', 'save', 'savez',
            'savez_compressed', 'packbits', 'unpackbits', 'fromregex', 'DataSource']
diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py
index 421efb675..de83016e9 100644
--- a/numpy/lib/polynomial.py
+++ b/numpy/lib/polynomial.py
@@ -1,6 +1,8 @@
 """
 Functions to operate on polynomials.
+
 """
+from __future__ import division
 
 __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd',
            'polysub', 'polymul', 'polydiv', 'polyval', 'poly1d',
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py
index 0127df9f9..c72cf2059 100644
--- a/numpy/lib/recfunctions.py
+++ b/numpy/lib/recfunctions.py
@@ -4,8 +4,8 @@ Collection of utilities to manipulate structured arrays.
 Most of these functions were initially implemented by John Hunter for matplotlib.
 They have been rewritten and extended for convenience.
 
-
 """
+from __future__ import division
 
 import sys
 import itertools
diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py
index 48ed1dc25..00fc4bccd 100644
--- a/numpy/lib/scimath.py
+++ b/numpy/lib/scimath.py
@@ -15,6 +15,7 @@ Similarly, `sqrt`, other base logarithms, `power` and trig functions are
 correctly handled.  See their respective docstrings for specific examples.
 
 """
+from __future__ import division
 
 __all__ = ['sqrt', 'log', 'log2', 'logn','log10', 'power', 'arccos',
            'arcsin', 'arctanh']
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
index e85fdb517..e69c8c4fa 100644
--- a/numpy/lib/setup.py
+++ b/numpy/lib/setup.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from os.path import join
 
 def configuration(parent_package='',top_path=None):
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index aefc81c2b..575f6149d 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['column_stack','row_stack', 'dstack','array_split','split','hsplit',
            'vsplit','dsplit','apply_over_axes','expand_dims',
            'apply_along_axis', 'kron', 'tile', 'get_array_wrap']
diff --git a/numpy/lib/stride_tricks.py b/numpy/lib/stride_tricks.py
index 7358be222..b82537024 100644
--- a/numpy/lib/stride_tricks.py
+++ b/numpy/lib/stride_tricks.py
@@ -5,6 +5,8 @@ An explanation of strides can be found in the "ndarray.rst" file in the
 NumPy reference guide.
 
 """
+from __future__ import division
+
 import numpy as np
 
 __all__ = ['broadcast_arrays']
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
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
index ce147965c..92df5306d 100644
--- a/numpy/lib/twodim_base.py
+++ b/numpy/lib/twodim_base.py
@@ -1,6 +1,7 @@
 """ Basic functions for manipulating 2d arrays
 
 """
+from __future__ import division
 
 __all__ = ['diag','diagflat','eye','fliplr','flipud','rot90','tri','triu',
            'tril','vander','histogram2d','mask_indices',
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index e22d63156..895c4d406 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -1,4 +1,7 @@
-## Automatically adapted for numpy Sep 19, 2005 by convertcode.py
+"""Automatically adapted for numpy Sep 19, 2005 by convertcode.py
+
+"""
+from __future__ import division
 
 __all__ = ['iscomplexobj','isrealobj','imag','iscomplex',
            'isreal','nan_to_num','real','real_if_close',
diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py
index b51365f41..8b85ef770 100644
--- a/numpy/lib/ufunclike.py
+++ b/numpy/lib/ufunclike.py
@@ -1,7 +1,10 @@
 """
 Module of functions that are like ufuncs in acting on arrays and optionally
 storing results in an output array.
+
 """
+from __future__ import division
+
 __all__ = ['fix', 'isneginf', 'isposinf']
 
 import numpy.core.numeric as nx
diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py
index 01b0b1c19..51ab10520 100644
--- a/numpy/lib/user_array.py
+++ b/numpy/lib/user_array.py
@@ -2,7 +2,9 @@
 Standard container-class for easy multiple-inheritance.
 Try to inherit from the ndarray instead of using this class as this is not
 complete.
+
 """
+from __future__ import division
 
 from numpy.core import array, asarray, absolute, add, subtract, multiply, \
      divide, remainder, power, left_shift, right_shift, bitwise_and, \
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
index 97f8358aa..0b8e3bfac 100644
--- a/numpy/lib/utils.py
+++ b/numpy/lib/utils.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import os
 import sys
 import types