Merge pull request #3202 from charris/2to3-reduce-fixups

MAINT: Cleanup some imports involving reduce.

4 files changed, 7 insertions, 10 deletions

diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index dbabc37ac..7f305310c 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function
 
 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
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index d2f1bb6b9..aa9b685d1 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -12,6 +12,7 @@ import types
 import warnings
 import sys
 import pickle
+from functools import reduce
 
 import numpy as np
 import numpy.ma.core
@@ -24,8 +25,6 @@ from numpy.testing.utils import WarningManager
 
 pi = np.pi
 
-if sys.version_info[0] >= 3:
-    from functools import reduce
 
 #..............................................................................
 class TestMaskedArray(TestCase):
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py
index 64d3ec683..f5c9e426e 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, print_function
 
-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=''):
diff --git a/numpy/ma/timer_comparison.py b/numpy/ma/timer_comparison.py
index 80a93c53b..6345f9ca3 100644
--- a/numpy/ma/timer_comparison.py
+++ b/numpy/ma/timer_comparison.py
@@ -1,8 +1,8 @@
 from __future__ import division, absolute_import, print_function
 
 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):