From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 29 Oct 2010 23:08:36 +0000 (+0000)
Subject: Properly close files used by test_email.
X-Git-Tag: v3.2a4~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=384917a922766e93c9195cb3e500d8391a6abb08;p=thirdparty%2FPython%2Fcpython.git

Properly close files used by test_email.
---

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index f40d77081d0d..34af77740a59 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -182,8 +182,8 @@ class TestMessageAPI(TestEmailBase):
     def test_message_rfc822_only(self):
         # Issue 7970: message/rfc822 not in multipart parsed by
         # HeaderParser caused an exception when flattened.
-        fp = openfile(findfile('msg_46.txt'))
-        msgdata = fp.read()
+        with openfile(findfile('msg_46.txt')) as fp:
+            msgdata = fp.read()
         parser = HeaderParser()
         msg = parser.parsestr(msgdata)
         out = StringIO()
@@ -2897,7 +2897,8 @@ class Test8BitBytesHandling(unittest.TestCase):
         self.addCleanup(unlink, fn)
         with open(fn, 'wb') as testfile:
             testfile.write(self.non_latin_bin_msg)
-        m = email.parser.BytesParser().parse(open(fn, 'rb'))
+        with open(fn, 'rb') as testfile:
+            m = email.parser.BytesParser().parse(testfile)
         self.assertEqual(str(m), self.non_latin_bin_msg_as7bit)
 
     latin_bin_msg = textwrap.dedent("""\