Merged revisions 80368-80369 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80368 | antoine.pitrou | 2010-04-22 15:19:31 +0200 (jeu., 22 avril 2010) | 3 lines
Fix mailcap.py built-in test.
........
r80369 | antoine.pitrou | 2010-04-22 15:30:10 +0200 (jeu., 22 avril 2010) | 5 lines
Issue #8496: make mailcap.lookup() always return a list, rather than an iterator.
Patch by Gregory Nofi.
........
diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index 086f05c..4ae13d7 100644
--- a/Lib/mailcap.py
+++ b/Lib/mailcap.py
@@ -164,7 +164,7 @@
if MIMEtype in caps:
entries = entries + caps[MIMEtype]
if key is not None:
- entries = filter(lambda e, key=key: key in e, entries)
+ entries = [e for e in entries if key in e]
return entries
def subst(field, MIMEtype, filename, plist=[]):
@@ -239,14 +239,12 @@
if not caps: caps = getcaps()
print("Mailcap entries:")
print()
- ckeys = caps.keys()
- ckeys.sort()
+ ckeys = sorted(caps)
for type in ckeys:
print(type)
entries = caps[type]
for e in entries:
- keys = e.keys()
- keys.sort()
+ keys = sorted(e)
for k in keys:
print(" %-15s" % k, e[k])
print()