diff options
Diffstat (limited to 'numpy/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 2154acdce..c13c7e94a 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -14,20 +14,24 @@ from operator import itemgetter from ._datasource import DataSource from ._compiled_base import packbits, unpackbits -from ._iotools import LineSplitter, NameValidator, StringConverter, \ - ConverterError, ConverterLockError, ConversionWarning, \ - _is_string_like, has_nested_fields, flatten_dtype, \ - easy_dtype, _bytes_to_name +from ._iotools import ( + LineSplitter, NameValidator, StringConverter, + ConverterError, ConverterLockError, ConversionWarning, + _is_string_like, has_nested_fields, flatten_dtype, + easy_dtype, _bytes_to_name + ) + +from numpy.compat import ( + asbytes, asstr, asbytes_nested, bytes, basestring, unicode + ) -from numpy.compat import asbytes, asstr, asbytes_nested, bytes, basestring from io import BytesIO if sys.version_info[0] >= 3: import pickle - imap = map else: import cPickle as pickle - imap = itertools.imap + from future_builtins import map loads = pickle.loads @@ -125,8 +129,7 @@ class BagObj(object): def zipfile_factory(*args, **kwargs): import zipfile - if sys.version_info >= (2, 5): - kwargs['allowZip64'] = True + kwargs['allowZip64'] = True return zipfile.ZipFile(*args, **kwargs) class NpzFile(object): @@ -1609,7 +1612,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 = imap(itemgetter(i), rows) + current_column = map(itemgetter(i), rows) for (j, value) in enumerate(current_column): try: converter.upgrade(value) |