[Python-checkins] r87020 - in python/branches/py3k/Lib: http/cookies.py http/server.py pydoc.py tabnanny.py test/pystone.py test/test_long.py

[georg.brandl]

Author: georg.brandl
Date: Sat Dec  4 11:39:14 2010
New Revision: 87020

Log:
#1513299: cleanup some map() uses where a comprehension works better.

Modified:
   python/branches/py3k/Lib/http/cookies.py
   python/branches/py3k/Lib/http/server.py
   python/branches/py3k/Lib/pydoc.py
   python/branches/py3k/Lib/tabnanny.py
   python/branches/py3k/Lib/test/pystone.py
   python/branches/py3k/Lib/test/test_long.py

Modified: python/branches/py3k/Lib/http/cookies.py
==============================================================================
--- python/branches/py3k/Lib/http/cookies.py	(original)
+++ python/branches/py3k/Lib/http/cookies.py	Sat Dec  4 11:39:14 2010
@@ -230,7 +230,7 @@
     if all(c in LegalChars for c in str):
         return str
     else:
-        return '"' + _nulljoin(map(_Translator.get, str, str)) + '"'
+        return '"' + _nulljoin(_Translator.get(s, s) for s in str) + '"'
 
 
 _OctalPatt = re.compile(r"\\[0-3][0-7][0-7]")

Modified: python/branches/py3k/Lib/http/server.py
==============================================================================
--- python/branches/py3k/Lib/http/server.py	(original)
+++ python/branches/py3k/Lib/http/server.py	Sat Dec  4 11:39:14 2010
@@ -868,7 +868,7 @@
     try:
         nobody = pwd.getpwnam('nobody')[2]
     except KeyError:
-        nobody = 1 + max(map(lambda x: x[2], pwd.getpwall()))
+        nobody = 1 + max(x[2] for x in pwd.getpwall())
     return nobody
 
 

Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================
--- python/branches/py3k/Lib/pydoc.py	(original)
+++ python/branches/py3k/Lib/pydoc.py	Sat Dec  4 11:39:14 2010
@@ -1000,7 +1000,7 @@
 
     def bold(self, text):
         """Format a string in bold by overstriking."""
-        return ''.join(map(lambda ch: ch + '\b' + ch, text))
+        return ''.join(ch + '\b' + ch for ch in text)
 
     def indent(self, text, prefix='    '):
         """Indent text by prepending a given prefix to each line."""
@@ -1024,7 +1024,7 @@
                 c, bases = entry
                 result = result + prefix + classname(c, modname)
                 if bases and bases != (parent,):
-                    parents = map(lambda c, m=modname: classname(c, m), bases)
+                    parents = (classname(c, modname) for c in bases)
                     result = result + '(%s)' % ', '.join(parents)
                 result = result + '\n'
             elif type(entry) is type([]):

Modified: python/branches/py3k/Lib/tabnanny.py
==============================================================================
--- python/branches/py3k/Lib/tabnanny.py	(original)
+++ python/branches/py3k/Lib/tabnanny.py	Sat Dec  4 11:39:14 2010
@@ -264,7 +264,7 @@
         return a
 
 def format_witnesses(w):
-    firsts = map(lambda tup: str(tup[0]), w)
+    firsts = (str(tup[0]) for tup in w)
     prefix = "at tab size"
     if len(w) > 1:
         prefix = prefix + "s"

Modified: python/branches/py3k/Lib/test/pystone.py
==============================================================================
--- python/branches/py3k/Lib/test/pystone.py	(original)
+++ python/branches/py3k/Lib/test/pystone.py	Sat Dec  4 11:39:14 2010
@@ -72,7 +72,7 @@
 Char1Glob = '\0'
 Char2Glob = '\0'
 Array1Glob = [0]*51
-Array2Glob = list(map(lambda x: x[:], [Array1Glob]*51))
+Array2Glob = [x[:] for x in [Array1Glob]*51]
 PtrGlb = None
 PtrGlbNext = None
 

Modified: python/branches/py3k/Lib/test/test_long.py
==============================================================================
--- python/branches/py3k/Lib/test/test_long.py	(original)
+++ python/branches/py3k/Lib/test/test_long.py	Sat Dec  4 11:39:14 2010
@@ -276,7 +276,7 @@
         digits = digits or [0]
         return '-'[:sign] + \
                {2: '0b', 8: '0o', 10: '', 16: '0x'}[base] + \
-               "".join(map(lambda i: "0123456789abcdef"[i], digits))
+               "".join("0123456789abcdef"[i] for i in digits)
 
     def check_format_1(self, x):
         for base, mapper in (8, oct), (10, repr), (16, hex):