summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/__init__.py2
-rw-r--r--numpy/ma/bench.py1
-rw-r--r--numpy/ma/core.py2
-rw-r--r--numpy/ma/extras.py2
-rw-r--r--numpy/ma/mrecords.py3
-rw-r--r--numpy/ma/setup.py2
-rw-r--r--numpy/ma/tests/test_core.py2
-rw-r--r--numpy/ma/tests/test_extras.py3
-rw-r--r--numpy/ma/tests/test_mrecords.py3
-rw-r--r--numpy/ma/tests/test_old_ma.py2
-rw-r--r--numpy/ma/tests/test_regression.py2
-rw-r--r--numpy/ma/tests/test_subclassing.py3
-rw-r--r--numpy/ma/testutils.py3
-rw-r--r--numpy/ma/timer_comparison.py2
-rw-r--r--numpy/ma/version.py5
15 files changed, 36 insertions, 1 deletions
diff --git a/numpy/ma/__init__.py b/numpy/ma/__init__.py
index 17caa9e02..7388a7ce3 100644
--- a/numpy/ma/__init__.py
+++ b/numpy/ma/__init__.py
@@ -36,6 +36,8 @@ may now proceed to calculate the mean of the other values:
invalid operation.
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = '1.0'
__revision__ = "$Revision: 3473 $"
diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py
index 2cc8f6a80..df6933eb9 100644
--- a/numpy/ma/bench.py
+++ b/numpy/ma/bench.py
@@ -1,5 +1,6 @@
#! python
# encoding: utf-8
+from __future__ import division
import timeit
#import IPython.ipapi
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index cfaa63c8a..371d5f302 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -20,6 +20,8 @@ Released for unlimited redistribution.
"""
# pylint: disable-msg=E1002
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant"
__docformat__ = "restructuredtext en"
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index 3133b168b..857d72249 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -8,6 +8,8 @@ A collection of utilities for `numpy.ma`.
:version: $Id: extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = '1.0'
__revision__ = "$Revision: 3473 $"
diff --git a/numpy/ma/mrecords.py b/numpy/ma/mrecords.py
index d3b2de3ba..084859d07 100644
--- a/numpy/ma/mrecords.py
+++ b/numpy/ma/mrecords.py
@@ -6,7 +6,10 @@ Note that :class:`numpy.ma.MaskedArray` already supports structured datatypes
and the masking of individual fields.
:author: Pierre Gerard-Marchant
+
"""
+from __future__ import division
+
#!!!: * We should make sure that no field is called '_mask','mask','_fieldmask',
#!!!: or whatever restricted keywords.
#!!!: An idea would be to no bother in the first place, and then rename the
diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py
index 024746655..2191d23f4 100644
--- a/numpy/ma/setup.py
+++ b/numpy/ma/setup.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = '1.0'
__revision__ = "$Revision: 3473 $"
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index cd60f7d71..cf8f1111d 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -4,6 +4,8 @@
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant"
import types
diff --git a/numpy/ma/tests/test_extras.py b/numpy/ma/tests/test_extras.py
index f1b36a15d..3f25ac21c 100644
--- a/numpy/ma/tests/test_extras.py
+++ b/numpy/ma/tests/test_extras.py
@@ -5,7 +5,10 @@ Adapted from the original test_ma by Pierre Gerard-Marchant
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
:version: $Id: test_extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $
+
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = '1.0'
__revision__ = "$Revision: 3473 $"
diff --git a/numpy/ma/tests/test_mrecords.py b/numpy/ma/tests/test_mrecords.py
index c8d9b0a46..4e59b8e41 100644
--- a/numpy/ma/tests/test_mrecords.py
+++ b/numpy/ma/tests/test_mrecords.py
@@ -3,7 +3,10 @@
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
+
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__revision__ = "$Revision: 3473 $"
__date__ = '$Date: 2007-10-29 17:18:13 +0200 (Mon, 29 Oct 2007) $'
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py
index 656f0b318..c9dbe4d4a 100644
--- a/numpy/ma/tests/test_old_ma.py
+++ b/numpy/ma/tests/test_old_ma.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
import numpy
import types
from numpy.ma import *
diff --git a/numpy/ma/tests/test_regression.py b/numpy/ma/tests/test_regression.py
index 3a634452b..85c290160 100644
--- a/numpy/ma/tests/test_regression.py
+++ b/numpy/ma/tests/test_regression.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
from numpy.testing import *
import numpy as np
import numpy.ma as ma
diff --git a/numpy/ma/tests/test_subclassing.py b/numpy/ma/tests/test_subclassing.py
index fb72ca773..ce3d8c889 100644
--- a/numpy/ma/tests/test_subclassing.py
+++ b/numpy/ma/tests/test_subclassing.py
@@ -4,7 +4,10 @@
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
:version: $Id: test_subclassing.py 3473 2007-10-29 15:18:13Z jarrod.millman $
+
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = '1.0'
__revision__ = "$Revision: 3473 $"
diff --git a/numpy/ma/testutils.py b/numpy/ma/testutils.py
index 4fb76b330..3707dcc16 100644
--- a/numpy/ma/testutils.py
+++ b/numpy/ma/testutils.py
@@ -3,7 +3,10 @@
:author: Pierre Gerard-Marchant
:contact: pierregm_at_uga_dot_edu
:version: $Id: testutils.py 3529 2007-11-13 08:01:14Z jarrod.millman $
+
"""
+from __future__ import division
+
__author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)"
__version__ = "1.0"
__revision__ = "$Revision: 3529 $"
diff --git a/numpy/ma/timer_comparison.py b/numpy/ma/timer_comparison.py
index 2588f53b2..adc1fa22b 100644
--- a/numpy/ma/timer_comparison.py
+++ b/numpy/ma/timer_comparison.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
import timeit
import sys
diff --git a/numpy/ma/version.py b/numpy/ma/version.py
index 7a925f1a8..73281311d 100644
--- a/numpy/ma/version.py
+++ b/numpy/ma/version.py
@@ -1,4 +1,7 @@
-"""Version number"""
+"""Version number
+
+"""
+from __future__ import division
version = '1.00'
release = False