[Python-checkins] r80369 - in python/branches/py3k: Lib/mailcap.py Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Apr 22 15:30:10 2010
New Revision: 80369

Log:
Issue #8496: make mailcap.lookup() always return a list, rather than an iterator.
Patch by Gregory Nofi.




Modified:
   python/branches/py3k/Lib/mailcap.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/mailcap.py
==============================================================================
--- python/branches/py3k/Lib/mailcap.py	(original)
+++ python/branches/py3k/Lib/mailcap.py	Thu Apr 22 15:30:10 2010
@@ -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=[]):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Apr 22 15:30:10 2010
@@ -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.