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 bc93026..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=[]):
diff --git a/Misc/NEWS b/Misc/NEWS
index 4697370..a305a0d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -326,6 +326,9 @@
Library
-------
+- Issue #8496: make mailcap.lookup() always return a list, rather than an
+ iterator. Patch by Gregory Nofi.
+
- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the
collation name contains a surrogate character.