diff options
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/npyio.py | 4 | ||||
| -rw-r--r-- | numpy/lib/recfunctions.py | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 600ab4a36..ea8d98656 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -24,8 +24,10 @@ from io import BytesIO if sys.version_info[0] >= 3: import pickle + imap = map else: import cPickle as pickle + imap = itertools.imap loads = pickle.loads @@ -1607,7 +1609,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, converter.iterupgrade(current_column) except ConverterLockError: errmsg = "Converter #%i is locked and cannot be upgraded: " % i - current_column = itertools.imap(itemgetter(i), rows) + current_column = imap(itemgetter(i), rows) for (j, value) in enumerate(current_column): try: converter.upgrade(value) diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index f909a4838..349d1996e 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -16,6 +16,11 @@ from numpy.ma import MaskedArray from numpy.ma.mrecords import MaskedRecords from numpy.lib._iotools import _is_string_like +if sys.version_info[0] >= 3: + izip = zip +else: + izip = itertools.izip + _check_fill_value = np.ma.core._check_fill_value __all__ = ['append_fields', @@ -287,7 +292,7 @@ def izip_records(seqarrays, fill_value=None, flatten=True): zipfunc = _izip_fields # try: - for tup in itertools.izip(*iters): + for tup in izip(*iters): yield tuple(zipfunc(tup)) except IndexError: pass @@ -412,7 +417,7 @@ def merge_arrays(seqarrays, seqmask = [] # If we expect some kind of MaskedArray, make a special loop. if usemask: - for (a, n) in itertools.izip(seqarrays, sizes): + for (a, n) in izip(seqarrays, sizes): nbmissing = (maxlength - n) # Get the data and mask data = a.ravel().__array__() @@ -441,7 +446,7 @@ def merge_arrays(seqarrays, output = output.view(MaskedRecords) else: # Same as before, without the mask we don't need... - for (a, n) in itertools.izip(seqarrays, sizes): + for (a, n) in izip(seqarrays, sizes): nbmissing = (maxlength - n) data = a.ravel().__array__() if nbmissing: |