From 653238a88db15c36a63ca70620f79ecd4b799d01 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sat, 30 Oct 2010 00:13:00 +0000 Subject: [PATCH] Silence some ResourceWarning in test_mailbox by using file context managers. Also call super().tearDown() where appropriate. --- Lib/test/test_mailbox.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 69e70ed82b3..de6d4bd47c2 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -165,8 +165,10 @@ class TestMailbox(TestBase): # Get file representations of messages key0 = self._box.add(self._template % 0) key1 = self._box.add(_sample_message) - data0 = self._box.get_file(key0).read() - data1 = self._box.get_file(key1).read() + with self._box.get_file(key0) as file: + data0 = file.read() + with self._box.get_file(key1) as file: + data1 = file.read() self.assertEqual(data0.replace(os.linesep, '\n'), self._template % 0) self.assertEqual(data1.replace(os.linesep, '\n'), @@ -773,6 +775,7 @@ class TestMaildir(TestMailbox): class _TestMboxMMDF(TestMailbox): def tearDown(self): + super().tearDown() self._box.close() self._delete_recursively(self._path) for lock_remnant in glob.glob(self._path + '.*'): @@ -1027,6 +1030,7 @@ class TestBabyl(TestMailbox): _factory = lambda self, path, factory=None: mailbox.Babyl(path, factory) def tearDown(self): + super().tearDown() self._box.close() self._delete_recursively(self._path) for lock_remnant in glob.glob(self._path + '.*'):