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/timer_comparison.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/timer_comparison.py')
| -rw-r--r-- | numpy/ma/timer_comparison.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/numpy/ma/timer_comparison.py b/numpy/ma/timer_comparison.py index 549448689..3662d5b03 100644 --- a/numpy/ma/timer_comparison.py +++ b/numpy/ma/timer_comparison.py @@ -1,8 +1,8 @@ from __future__ import division, absolute_import import timeit +from functools import reduce -import sys import numpy as np from numpy import float_ import np.core.fromnumeric as fromnumeric @@ -13,8 +13,6 @@ np.seterr(all='ignore') pi = np.pi -if sys.version_info[0] >= 3: - from functools import reduce class moduletester(object): def __init__(self, module): |