diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-09 12:44:24 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-10 16:41:13 -0600 |
commit | a6164794a63215e23fa28432d9acec4727c68d02 (patch) | |
tree | e1f1cb2da6aac69cb3410b623fcf224ec433d1a4 /numpy/lib/_iotools.py | |
parent | f85bdf48aadf7b5a5f575370b589805fed190a6c (diff) | |
download | numpy-a6164794a63215e23fa28432d9acec4727c68d02.tar.gz |
2to3: Apply `map` fixer.
In Python 3 `map` is an iterator while in Python 2 it returns a list.
The simple fix applied by the fixer is to inclose all instances of map
with `list(...)`. This is not needed in all cases, and even where
appropriate list comprehensions may be preferred for their clarity.
Consequently, this patch attempts to use list comprehensions where it
makes sense.
When the mapped function has two arguments there is another problem that
can arise. In Python 3 map stops execution when the shortest argument
list is exhausted, while in Python 2 it stops when the longest argument
list is exhausted. Consequently the two argument case might need special
care. However, we have been running Python3 converted versions of numpy
since 1.5 without problems, so it is probably not something that affects
us.
Closes #3068
Diffstat (limited to 'numpy/lib/_iotools.py')
-rw-r--r-- | numpy/lib/_iotools.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index 34c85e47e..9eaf4d78f 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -721,7 +721,8 @@ class StringConverter(object): value = (value,) _strict_call = self._strict_call try: - map(_strict_call, value) + for _m in value: + _strict_call(_m) except ValueError: # Raise an exception if we locked the converter... if self._locked: |