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.

19 files changed, 30 insertions, 15 deletions

diff --git a/numpy/numarray/__init__.py b/numpy/numarray/__init__.py
index 441ec4450..964ee2baa 100644
--- a/numpy/numarray/__init__.py
+++ b/numpy/numarray/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from util import *
 from numerictypes import *
 from functions import *
diff --git a/numpy/numarray/alter_code1.py b/numpy/numarray/alter_code1.py
index ae950e7e0..2393aff5a 100644
--- a/numpy/numarray/alter_code1.py
+++ b/numpy/numarray/alter_code1.py
@@ -52,6 +52,8 @@ Makes the following changes:
    - .setimaginary() --> .imag
 
 """
+from __future__ import division
+
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
 import sys
diff --git a/numpy/numarray/alter_code2.py b/numpy/numarray/alter_code2.py
index 4bb773850..4d76222da 100644
--- a/numpy/numarray/alter_code2.py
+++ b/numpy/numarray/alter_code2.py
@@ -5,7 +5,8 @@ with numpy
 FIXME:  finish this.
 
 """
-#__all__ = ['convertfile', 'convertall', 'converttree']
+from __future__ import division
+
 __all__ = []
 
 import warnings
diff --git a/numpy/numarray/compat.py b/numpy/numarray/compat.py
index e0d13a7c2..794a2d591 100644
--- a/numpy/numarray/compat.py
+++ b/numpy/numarray/compat.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['NewAxis', 'ArrayType']
 
diff --git a/numpy/numarray/convolve.py b/numpy/numarray/convolve.py
index 68a4730a1..14c16f008 100644
--- a/numpy/numarray/convolve.py
+++ b/numpy/numarray/convolve.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 try:
     from stsci.convolve import *
 except ImportError:
diff --git a/numpy/numarray/fft.py b/numpy/numarray/fft.py
index c7ac6a27e..158c8807e 100644
--- a/numpy/numarray/fft.py
+++ b/numpy/numarray/fft.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 from numpy.oldnumeric.fft import *
 import numpy.oldnumeric.fft as nof
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py
index 1c2141c98..7242f2870 100644
--- a/numpy/numarray/functions.py
+++ b/numpy/numarray/functions.py
@@ -1,18 +1,6 @@
+from __future__ import division
+
 # missing Numarray defined names (in from numarray import *)
-##__all__ = ['ClassicUnpickler', 'Complex32_fromtype',
-##           'Complex64_fromtype', 'ComplexArray', 'Error',
-##           'MAX_ALIGN', 'MAX_INT_SIZE', 'MAX_LINE_WIDTH',
-##           'NDArray', 'NewArray', 'NumArray',
-##           'NumError', 'PRECISION', 'Py2NumType',
-##           'PyINT_TYPES', 'PyLevel2Type', 'PyNUMERIC_TYPES', 'PyREAL_TYPES',
-##           'SUPPRESS_SMALL',
-##           'SuitableBuffer', 'USING_BLAS',
-##           'UsesOpPriority',
-##           'codegenerator', 'generic', 'libnumarray', 'libnumeric',
-##           'make_ufuncs', 'memory',
-##           'numarrayall', 'numarraycore', 'numinclude', 'safethread',
-##           'typecode', 'typecodes', 'typeconv', 'ufunc', 'ufuncFactory',
-##           'ieeemask']
 
 __all__ = ['asarray', 'ones', 'zeros', 'array', 'where']
 __all__ += ['vdot', 'dot', 'matrixmultiply', 'ravel', 'indices',
diff --git a/numpy/numarray/image.py b/numpy/numarray/image.py
index 323528905..112fdac9e 100644
--- a/numpy/numarray/image.py
+++ b/numpy/numarray/image.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 try:
     from stsci.image import *
 except ImportError:
diff --git a/numpy/numarray/linear_algebra.py b/numpy/numarray/linear_algebra.py
index 238dff952..1c716e05b 100644
--- a/numpy/numarray/linear_algebra.py
+++ b/numpy/numarray/linear_algebra.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 from numpy.oldnumeric.linear_algebra import *
 
diff --git a/numpy/numarray/ma.py b/numpy/numarray/ma.py
index 5c7a19cf2..2b820a98d 100644
--- a/numpy/numarray/ma.py
+++ b/numpy/numarray/ma.py
@@ -1,2 +1,3 @@
+from __future__ import division
 
 from numpy.oldnumeric.ma import *
diff --git a/numpy/numarray/matrix.py b/numpy/numarray/matrix.py
index 86d79bbe2..723613c63 100644
--- a/numpy/numarray/matrix.py
+++ b/numpy/numarray/matrix.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['Matrix']
 
diff --git a/numpy/numarray/mlab.py b/numpy/numarray/mlab.py
index 05f234d37..70ccf077a 100644
--- a/numpy/numarray/mlab.py
+++ b/numpy/numarray/mlab.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 from numpy.oldnumeric.mlab import *
 import numpy.oldnumeric.mlab as nom
diff --git a/numpy/numarray/nd_image.py b/numpy/numarray/nd_image.py
index dff7fa066..a9a7ee1f4 100644
--- a/numpy/numarray/nd_image.py
+++ b/numpy/numarray/nd_image.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 try:
     from ndimage import *
 except ImportError:
diff --git a/numpy/numarray/numerictypes.py b/numpy/numarray/numerictypes.py
index 70a134855..ef1ccb2a3 100644
--- a/numpy/numarray/numerictypes.py
+++ b/numpy/numarray/numerictypes.py
@@ -25,7 +25,10 @@ Exported symbols include:
       ComplexType
 
 $Id: numerictypes.py,v 1.55 2005/12/01 16:22:03 jaytmiller Exp $
+
 """
+from __future__ import division
+
 
 __all__ = ['NumericType','HasUInt64','typeDict','IsType',
            'BooleanType', 'SignedType', 'UnsignedType', 'IntegralType',
diff --git a/numpy/numarray/random_array.py b/numpy/numarray/random_array.py
index d70e2694a..654f58346 100644
--- a/numpy/numarray/random_array.py
+++ b/numpy/numarray/random_array.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['ArgumentError', 'F', 'beta', 'binomial', 'chi_square',
            'exponential', 'gamma', 'get_seed', 'multinomial',
diff --git a/numpy/numarray/session.py b/numpy/numarray/session.py
index f95f5ec34..fab80a1e2 100644
--- a/numpy/numarray/session.py
+++ b/numpy/numarray/session.py
@@ -72,6 +72,7 @@ Saved modules are re-imported at load time but any "state" in the module
 which is not restored by a simple import is lost.
 
 """
+from __future__ import division
 
 __all__ = ['load', 'save']
 
diff --git a/numpy/numarray/setup.py b/numpy/numarray/setup.py
index 641990217..ab3f2a4d5 100644
--- a/numpy/numarray/setup.py
+++ b/numpy/numarray/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/numarray/ufuncs.py b/numpy/numarray/ufuncs.py
index 3fb5671ce..357972c79 100644
--- a/numpy/numarray/ufuncs.py
+++ b/numpy/numarray/ufuncs.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh',
            'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_not',
diff --git a/numpy/numarray/util.py b/numpy/numarray/util.py
index 9555474a8..819987cbf 100644
--- a/numpy/numarray/util.py
+++ b/numpy/numarray/util.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import os
 import numpy as np