commit 1adbacfd1c80f4f724c5d515e48a518d0b1be2dd
author Serhiy Storchaka <storchaka@gmail.com> Sat Jan 25 19:42:27 2014 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Sat Jan 25 19:42:27 2014 +0200
tree c2c0e80d7163597cd158aaad1626720b418b1fda
parent d8be9feb45baab60959d4076dc997062b307206f

Issue #20331: Fixed possible FD leaks in various modules:
SimpleHTTPServer, imghdr, mailcap, mimetypes, xml.etree.

Lib/mailcap.py

diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index b2ddacd..04077ba 100644
--- a/Lib/mailcap.py
+++ b/Lib/mailcap.py
@@ -22,8 +22,8 @@
             fp = open(mailcap, 'r')
         except IOError:
             continue
-        morecaps = readmailcapfile(fp)
-        fp.close()
+        with fp:
+            morecaps = readmailcapfile(fp)
         for key, value in morecaps.iteritems():
             if not key in caps:
                 caps[key] = value