summaryrefslogtreecommitdiff
path: root/numpy/ma/core.py
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/ma/core.py
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/ma/core.py')
-rw-r--r--numpy/ma/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 64cfafe7c..f085d6796 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -24,6 +24,7 @@ from __future__ import division, absolute_import
import sys
import warnings
+from functools import reduce
import numpy as np
import numpy.core.umath as umath
@@ -35,7 +36,6 @@ from numpy.compat import getargspec, formatargspec
from numpy import expand_dims as n_expand_dims
if sys.version_info[0] >= 3:
- from functools import reduce
import pickle
else:
import cPickle as pickle