summaryrefslogtreecommitdiff
path: root/numpy/oldnumeric
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-06 10:02:23 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-04-06 10:29:12 -0600
commit77e09f14bdf9eeebbd20ca861cb51da3e570bb72 (patch)
treeb0c49fa552ccad7d2e9a384db72b79f5a758ba83 /numpy/oldnumeric
parent7441fa50523f5b4a16c854bf004d675e5bd86ab8 (diff)
downloadnumpy-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/oldnumeric')
-rw-r--r--numpy/oldnumeric/ma.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/oldnumeric/ma.py b/numpy/oldnumeric/ma.py
index b449d619c..222e72270 100644
--- a/numpy/oldnumeric/ma.py
+++ b/numpy/oldnumeric/ma.py
@@ -20,9 +20,8 @@ from numpy.core.fromnumeric import amax, amin
from numpy.core.numerictypes import bool_, typecodes
import numpy.core.numeric as numeric
import warnings
+from functools import reduce
-if sys.version_info[0] >= 3:
- from functools import reduce
# Ufunc domain lookup for __array_wrap__
ufunc_domain = {}