summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/arrayprint.py3
-rw-r--r--numpy/distutils/system_info.py3
-rw-r--r--numpy/f2py/auxfuncs.py3
-rw-r--r--numpy/lib/arrayterator.py3
-rw-r--r--numpy/lib/tests/test_arrayterator.py4
-rw-r--r--numpy/ma/core.py2
-rw-r--r--numpy/ma/tests/test_core.py3
-rw-r--r--numpy/ma/tests/test_old_ma.py8
-rw-r--r--numpy/ma/timer_comparison.py4
-rw-r--r--numpy/oldnumeric/ma.py3
10 files changed, 13 insertions, 23 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index 6e53dca00..396ef5ae6 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -16,6 +16,7 @@ __docformat__ = 'restructuredtext'
# and by Travis Oliphant 2005-8-22 for numpy
import sys
+from functools import reduce
from . import numerictypes as _nt
from .umath import maximum, minimum, absolute, not_equal, isnan, isinf
from .multiarray import format_longfloat, datetime_as_string, datetime_data
@@ -34,8 +35,6 @@ _nan_str = 'nan'
_inf_str = 'inf'
_formatter = None # formatting function for array elements
-if sys.version_info[0] >= 3:
- from functools import reduce
def set_printoptions(precision=None, threshold=None, edgeitems=None,
linewidth=None, suppress=None,
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index ff32daf69..44a5548cb 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -118,6 +118,7 @@ import re
import copy
import warnings
from glob import glob
+from functools import reduce
if sys.version_info[0] < 3:
from ConfigParser import NoOptionError, ConfigParser
@@ -137,8 +138,6 @@ from numpy.distutils.misc_util import is_sequence, is_string, \
from numpy.distutils.command.config import config as cmd_config
from numpy.distutils.compat import get_exception
-if sys.version_info[0] >= 3:
- from functools import reduce
# Determine number of bits
import platform
diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py
index 5b13747f1..8c19b9611 100644
--- a/numpy/f2py/auxfuncs.py
+++ b/numpy/f2py/auxfuncs.py
@@ -24,6 +24,7 @@ f2py_version = __version__.version
import pprint
import sys
import types
+from functools import reduce
from . import cfuncs
@@ -35,8 +36,6 @@ options={}
debugoptions=[]
wrapfuncs = 1
-if sys.version_info[0] >= 3:
- from functools import reduce
def outmess(t):
if options.get('verbose',1):
diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py
index b71e9a123..360d61bc5 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 28feb4824..3fa15fef1 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
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))
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
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index 7eb4bbed2..81114fb2e 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 41f7779d9..ba2b3fbf8 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
-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 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):
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 = {}