24 files changed, 77 insertions, 22 deletions
diff --git a/numpy/oldnumeric/__init__.py b/numpy/oldnumeric/__init__.py
index 05712c02c..5fc8f7c76 100644
--- a/numpy/oldnumeric/__init__.py
+++ b/numpy/oldnumeric/__init__.py
@@ -1,4 +1,8 @@
-# Don't add these to the __all__ variable though
+"""Don't add these to the __all__ variable though
+
+"""
+from __future__ import division
+
 from numpy import *
 
 def _move_axis_to_0(a, axis):
diff --git a/numpy/oldnumeric/alter_code1.py b/numpy/oldnumeric/alter_code1.py
index 87538a855..5eb1c99f2 100644
--- a/numpy/oldnumeric/alter_code1.py
+++ b/numpy/oldnumeric/alter_code1.py
@@ -27,7 +27,10 @@ Makes the following changes:
 
  * Converts uses of type(...) is <type>
    isinstance(..., <type>)
+
 """
+from __future__ import division
+
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
 import sys
diff --git a/numpy/oldnumeric/alter_code2.py b/numpy/oldnumeric/alter_code2.py
index baa6b9d26..61f285f63 100644
--- a/numpy/oldnumeric/alter_code2.py
+++ b/numpy/oldnumeric/alter_code2.py
@@ -19,6 +19,8 @@ Makes the following changes:
    oldnumeric.random_array, and oldnumeric.fft
 
 """
+from __future__ import division
+
 #__all__ = ['convertfile', 'convertall', 'converttree']
 __all__ = []
 
diff --git a/numpy/oldnumeric/array_printer.py b/numpy/oldnumeric/array_printer.py
index 95f3f42c7..7c0428c14 100644
--- a/numpy/oldnumeric/array_printer.py
+++ b/numpy/oldnumeric/array_printer.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['array2string']
 
diff --git a/numpy/oldnumeric/arrayfns.py b/numpy/oldnumeric/arrayfns.py
index 54992de57..1db219d4a 100644
--- a/numpy/oldnumeric/arrayfns.py
+++ b/numpy/oldnumeric/arrayfns.py
@@ -1,5 +1,7 @@
-"""Backward compatible with arrayfns from Numeric
+"""Backward compatible with arrayfns from Numeric.
+
 """
+from __future__ import division
 
 __all__ = ['array_set', 'construct3', 'digitize', 'error', 'find_mask',
            'histogram', 'index_sort', 'interp', 'nz', 'reverse', 'span',
diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py
index 083a1fa15..0c18917d0 100644
--- a/numpy/oldnumeric/compat.py
+++ b/numpy/oldnumeric/compat.py
@@ -1,4 +1,7 @@
-# Compatibility module containing deprecated names
+"""Compatibility module containing deprecated names.
+
+"""
+from __future__ import division
 
 __all__ = ['NewAxis',
            'UFuncType', 'UfuncType', 'ArrayType', 'arraytype',
diff --git a/numpy/oldnumeric/fft.py b/numpy/oldnumeric/fft.py
index 67f30c750..ace7d27d9 100644
--- a/numpy/oldnumeric/fft.py
+++ b/numpy/oldnumeric/fft.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['fft', 'fft2d', 'fftnd', 'hermite_fft', 'inverse_fft',
            'inverse_fft2d', 'inverse_fftnd',
diff --git a/numpy/oldnumeric/fix_default_axis.py b/numpy/oldnumeric/fix_default_axis.py
index 8483de85e..262f82859 100644
--- a/numpy/oldnumeric/fix_default_axis.py
+++ b/numpy/oldnumeric/fix_default_axis.py
@@ -32,7 +32,10 @@ cumprod
 prod
 std
 mean
+
 """
+from __future__ import division
+
 __all__ = ['convertfile', 'convertall', 'converttree']
 
 import sys
diff --git a/numpy/oldnumeric/functions.py b/numpy/oldnumeric/functions.py
index db62f7cb5..1e4daef5d 100644
--- a/numpy/oldnumeric/functions.py
+++ b/numpy/oldnumeric/functions.py
@@ -1,4 +1,7 @@
-# Functions that should behave the same as Numeric and need changing
+"""Functions that should behave the same as Numeric and need changing
+
+"""
+from __future__ import division
 
 import numpy as np
 import numpy.core.multiarray as mu
diff --git a/numpy/oldnumeric/linear_algebra.py b/numpy/oldnumeric/linear_algebra.py
index 2e7a264fe..a8600c77d 100644
--- a/numpy/oldnumeric/linear_algebra.py
+++ b/numpy/oldnumeric/linear_algebra.py
@@ -1,10 +1,12 @@
 """Backward compatible with LinearAlgebra from Numeric
-"""
-# This module is a lite version of the linalg.py module in SciPy which contains
-# high-level Python interface to the LAPACK library.  The lite version
-# only accesses the following LAPACK functions: dgesv, zgesv, dgeev,
-# zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
 
+This module is a lite version of the linalg.py module in SciPy which contains
+high-level Python interface to the LAPACK library.  The lite version
+only accesses the following LAPACK functions: dgesv, zgesv, dgeev,
+zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
+
+"""
+from __future__ import division
 
 __all__ = ['LinAlgError', 'solve_linear_equations',
            'inverse', 'cholesky_decomposition', 'eigenvalues',
diff --git a/numpy/oldnumeric/ma.py b/numpy/oldnumeric/ma.py
index 732e8447a..46af041ba 100644
--- a/numpy/oldnumeric/ma.py
+++ b/numpy/oldnumeric/ma.py
@@ -1,4 +1,5 @@
 """MA: a facility for dealing with missing observations
+
 MA is generally used as a numpy.array look-alike.
 by Paul F. Dubois.
 
@@ -8,6 +9,8 @@ Adapted for numpy_core 2005 by Travis Oliphant and
 (mainly) Paul Dubois.
 
 """
+from __future__ import division
+
 import types, sys
 
 import numpy.core.umath as umath
diff --git a/numpy/oldnumeric/matrix.py b/numpy/oldnumeric/matrix.py
index ddd612266..9be08e93c 100644
--- a/numpy/oldnumeric/matrix.py
+++ b/numpy/oldnumeric/matrix.py
@@ -1,4 +1,7 @@
-# This module is for compatibility only.
+"""This module is for compatibility only.
+
+"""
+from __future__ import division
 
 __all__ = ['UserArray', 'squeeze', 'Matrix', 'asarray', 'dot', 'k', 'Numeric', 'LinearAlgebra', 'identity', 'multiply', 'types', 'string']
 
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index ccd47efbb..3871d8251 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -1,5 +1,7 @@
-# Functions that already have the correct syntax or miscellaneous functions
+"""Functions that already have the correct syntax or miscellaneous functions
 
+"""
+from __future__ import division
 
 __all__ = ['sort', 'copy_reg', 'clip', 'rank',
            'sign', 'shape', 'types', 'allclose', 'size',
diff --git a/numpy/oldnumeric/mlab.py b/numpy/oldnumeric/mlab.py
index 2c84b6960..e2ea78c02 100644
--- a/numpy/oldnumeric/mlab.py
+++ b/numpy/oldnumeric/mlab.py
@@ -1,4 +1,7 @@
-# This module is for compatibility only.  All functions are defined elsewhere.
+"""This module is for compatibility only.  All functions are defined elsewhere.
+
+"""
+from __future__ import division
 
 __all__ = ['rand', 'tril', 'trapz', 'hanning', 'rot90', 'triu', 'diff', 'angle',
            'roots', 'ptp', 'kaiser', 'randn', 'cumprod', 'diag', 'msort',
diff --git a/numpy/oldnumeric/precision.py b/numpy/oldnumeric/precision.py
index c773e9478..c6579f302 100644
--- a/numpy/oldnumeric/precision.py
+++ b/numpy/oldnumeric/precision.py
@@ -1,7 +1,12 @@
-# Lifted from Precision.py.  This is for compatibility only.
-#
-#  The character strings are still for "new" NumPy
-#   which is the only Incompatibility with Numeric
+"""
+
+Lifted from Precision.py.  This is for compatibility only.
+
+The character strings are still for "new" NumPy
+which is the only Incompatibility with Numeric
+
+"""
+from __future__ import division
 
 __all__ = ['Character', 'Complex', 'Float',
            'PrecisionError', 'PyObject', 'Int', 'UInt',
diff --git a/numpy/oldnumeric/random_array.py b/numpy/oldnumeric/random_array.py
index 7141e564b..a7f6c4112 100644
--- a/numpy/oldnumeric/random_array.py
+++ b/numpy/oldnumeric/random_array.py
@@ -1,4 +1,7 @@
-# Backward compatible module for RandomArray
+"""Backward compatible module for RandomArray
+
+"""
+from __future__ import division
 
 __all__ = ['ArgumentError','F','beta','binomial','chi_square', 'exponential',
            'gamma', 'get_seed', 'mean_var_test', 'multinomial',
diff --git a/numpy/oldnumeric/rng.py b/numpy/oldnumeric/rng.py
index 38b182eae..28fb9d591 100644
--- a/numpy/oldnumeric/rng.py
+++ b/numpy/oldnumeric/rng.py
@@ -1,8 +1,10 @@
-# This module re-creates the RNG interface from Numeric
-# Replace import RNG with import numpy.oldnumeric.rng as RNG
-#
-# It is for backwards compatibility only.
+"""Re-create the RNG interface from Numeric.
 
+Replace import RNG with import numpy.oldnumeric.rng as RNG.
+It is for backwards compatibility only.
+
+"""
+from __future__ import division
 
 __all__ = ['CreateGenerator','ExponentialDistribution','LogNormalDistribution',
            'NormalDistribution', 'UniformDistribution', 'error', 'ranf',
diff --git a/numpy/oldnumeric/rng_stats.py b/numpy/oldnumeric/rng_stats.py
index 8c7fec433..96e50f9a4 100644
--- a/numpy/oldnumeric/rng_stats.py
+++ b/numpy/oldnumeric/rng_stats.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 __all__ = ['average', 'histogram', 'standardDeviation', 'variance']
 
diff --git a/numpy/oldnumeric/setup.py b/numpy/oldnumeric/setup.py
index 31b5ff3cc..9482c216d 100644
--- a/numpy/oldnumeric/setup.py
+++ b/numpy/oldnumeric/setup.py
@@ -1,3 +1,4 @@
+from __future__ import division
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
diff --git a/numpy/oldnumeric/tests/test_oldnumeric.py b/numpy/oldnumeric/tests/test_oldnumeric.py
index 24d709d2c..58ccc710a 100644
--- a/numpy/oldnumeric/tests/test_oldnumeric.py
+++ b/numpy/oldnumeric/tests/test_oldnumeric.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import unittest
 
 from numpy.testing import *
diff --git a/numpy/oldnumeric/tests/test_regression.py b/numpy/oldnumeric/tests/test_regression.py
index 235ae4fe5..dd221699d 100644
--- a/numpy/oldnumeric/tests/test_regression.py
+++ b/numpy/oldnumeric/tests/test_regression.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from numpy.testing import *
 
 rlevel = 1
diff --git a/numpy/oldnumeric/typeconv.py b/numpy/oldnumeric/typeconv.py
index 4e203d4ae..014477950 100644
--- a/numpy/oldnumeric/typeconv.py
+++ b/numpy/oldnumeric/typeconv.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes']
 
 import numpy as np
diff --git a/numpy/oldnumeric/ufuncs.py b/numpy/oldnumeric/ufuncs.py
index c26050f55..9ace30a91 100644
--- a/numpy/oldnumeric/ufuncs.py
+++ b/numpy/oldnumeric/ufuncs.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 __all__ = ['less', 'cosh', 'arcsinh', 'add', 'ceil', 'arctan2', 'floor_divide',
            'fmod', 'hypot', 'logical_and', 'power', 'sinh', 'remainder', 'cos',
            'equal', 'arccos', 'less_equal', 'divide', 'bitwise_or',
diff --git a/numpy/oldnumeric/user_array.py b/numpy/oldnumeric/user_array.py
index 375c4013b..08be8135b 100644
--- a/numpy/oldnumeric/user_array.py
+++ b/numpy/oldnumeric/user_array.py
@@ -1,4 +1,4 @@
-
+from __future__ import division
 
 from numpy.oldnumeric import *
 from numpy.lib.user_array import container as UserArray