diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 10:02:23 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 10:29:12 -0600 |
commit | 77e09f14bdf9eeebbd20ca861cb51da3e570bb72 (patch) | |
tree | b0c49fa552ccad7d2e9a384db72b79f5a758ba83 /numpy/ma/tests/test_old_ma.py | |
parent | 7441fa50523f5b4a16c854bf004d675e5bd86ab8 (diff) | |
download | numpy-77e09f14bdf9eeebbd20ca861cb51da3e570bb72.tar.gz |
MAINT: Cleanup some imports involving reduce.
Because reduce has been available in functools since Python 2.6 we
can get rid of the version checks we currently have before we import
it.
Also removes some reduce related skips in tools/py3tool.py. We were
already skipping the reduce fixer so this has no effect other than
cleaning up the code.
Diffstat (limited to 'numpy/ma/tests/test_old_ma.py')
-rw-r--r-- | numpy/ma/tests/test_old_ma.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py index 41f7779d9..ba2b3fbf8 100644 --- a/numpy/ma/tests/test_old_ma.py +++ b/numpy/ma/tests/test_old_ma.py @@ -1,15 +1,15 @@ from __future__ import division, absolute_import -import numpy +import sys import types +from functools import reduce + +import numpy from numpy.ma import * from numpy.core.numerictypes import float32 from numpy.ma.core import umath from numpy.testing import * -import sys -if sys.version_info[0] >= 3: - from functools import reduce pi = numpy.pi def eq(v, w, msg=''): |