diff options
author | njsmith <njs@pobox.com> | 2013-04-07 03:39:34 -0700 |
---|---|---|
committer | njsmith <njs@pobox.com> | 2013-04-07 03:39:34 -0700 |
commit | ef76d4928ea1591d382fceaa416678907ea76098 (patch) | |
tree | 498f3e5c9a4efe4149cf2913ab18d2eb81c1d59d /numpy/lib | |
parent | 3c70e20a5f1aed4098ba66d21e6a1f60edc6fddd (diff) | |
parent | 77e09f14bdf9eeebbd20ca861cb51da3e570bb72 (diff) | |
download | numpy-ef76d4928ea1591d382fceaa416678907ea76098.tar.gz |
Merge pull request #3202 from charris/2to3-reduce-fixups
MAINT: Cleanup some imports involving reduce.
Diffstat (limited to 'numpy/lib')
-rw-r--r-- | numpy/lib/arrayterator.py | 3 | ||||
-rw-r--r-- | numpy/lib/tests/test_arrayterator.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py index 856c4633a..761d63749 100644 --- a/numpy/lib/arrayterator.py +++ b/numpy/lib/arrayterator.py @@ -14,8 +14,7 @@ from operator import mul __all__ = ['Arrayterator'] import sys -if sys.version_info[0] >= 3: - from functools import reduce +from functools import reduce class Arrayterator(object): """ diff --git a/numpy/lib/tests/test_arrayterator.py b/numpy/lib/tests/test_arrayterator.py index 197d863f4..64ad7f4de 100644 --- a/numpy/lib/tests/test_arrayterator.py +++ b/numpy/lib/tests/test_arrayterator.py @@ -1,15 +1,13 @@ from __future__ import division, absolute_import, print_function from operator import mul +from functools import reduce import numpy as np from numpy.random import randint from numpy.lib import Arrayterator from numpy.testing import assert_ -import sys -if sys.version_info[0] >= 3: - from functools import reduce def test(): np.random.seed(np.arange(10)) |