mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
#11767: use context manager to close file in __getitem__ to prevent FD leak
All of the other methods in mailbox that create message objects take care to close the file descriptors they use, so it seems to make sense to have __getitem__ do so as well. Patch by Filip Gruszczyński.
This commit is contained in:
parent
26de69dff8
commit
05ff990401
3 changed files with 37 additions and 2 deletions
|
@ -1201,6 +1201,37 @@ class TestBabyl(TestMailbox):
|
|||
self.assertEqual(set(self._box.get_labels()), set(['blah']))
|
||||
|
||||
|
||||
class FakeFileLikeObject:
|
||||
|
||||
def __init__(self):
|
||||
self.closed = False
|
||||
|
||||
def close(self):
|
||||
self.closed = True
|
||||
|
||||
|
||||
class FakeMailBox(mailbox.Mailbox):
|
||||
|
||||
def __init__(self):
|
||||
mailbox.Mailbox.__init__(self, '', lambda file: None)
|
||||
self.files = [FakeFileLikeObject() for i in range(10)]
|
||||
|
||||
def get_file(self, key):
|
||||
return self.files[key]
|
||||
|
||||
|
||||
class TestFakeMailBox(unittest.TestCase):
|
||||
|
||||
def test_closing_fd(self):
|
||||
box = FakeMailBox()
|
||||
for i in range(10):
|
||||
self.assertFalse(box.files[i].closed)
|
||||
for i in range(10):
|
||||
box[i]
|
||||
for i in range(10):
|
||||
self.assertTrue(box.files[i].closed)
|
||||
|
||||
|
||||
class TestMessage(TestBase):
|
||||
|
||||
_factory = mailbox.Message # Overridden by subclasses to reuse tests
|
||||
|
@ -2113,7 +2144,7 @@ def test_main():
|
|||
TestBabyl, TestMessage, TestMaildirMessage, TestMboxMessage,
|
||||
TestMHMessage, TestBabylMessage, TestMMDFMessage,
|
||||
TestMessageConversion, TestProxyFile, TestPartialFile,
|
||||
MaildirTestCase)
|
||||
MaildirTestCase, TestFakeMailBox)
|
||||
support.run_unittest(*tests)
|
||||
support.reap_children()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue