summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-09 12:44:24 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-04-10 16:41:13 -0600
commita6164794a63215e23fa28432d9acec4727c68d02 (patch)
treee1f1cb2da6aac69cb3410b623fcf224ec433d1a4 /doc
parentf85bdf48aadf7b5a5f575370b589805fed190a6c (diff)
downloadnumpy-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 'doc')
-rwxr-xr-xdoc/summarize.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/summarize.py b/doc/summarize.py
index c8a23ebee..833436cee 100755
--- a/doc/summarize.py
+++ b/doc/summarize.py
@@ -149,8 +149,8 @@ def format_in_columns(lst, max_columns):
Format a list containing strings to a string containing the items
in columns.
"""
- lst = map(str, lst)
- col_len = max(map(len, lst)) + 2
+ lst = [str(_m) for _m in lst]
+ col_len = max([len(_m) for _m in lst]) + 2
ncols = 80//col_len
if ncols > max_columns:
ncols = max_columns