diff options
author | R David Murray <rdmurray@bitdance.com> | 2014-06-26 13:33:05 -0400 |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2014-06-26 13:33:05 -0400 |
commit | b85dd143d8030509ca490983b9af28a0e0a1bb1a (patch) | |
tree | edd78876837a4c38eda180b1c45f7ec0abe92469 /Lib | |
parent | 7c56054fc1f5fd193c56da3058181d97eaec8e20 (diff) | |
parent | 459d1ac614fab235001d29e407933b295e85d724 (diff) | |
download | cpython-b85dd143d8030509ca490983b9af28a0e0a1bb1a.tar.gz |
Merge #21476: Unwrap fp in BytesParser so the file isn't unexpectedly closed.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/email/parser.py | 4 | ||||
-rw-r--r-- | Lib/test/test_email/test_email.py | 25 |
2 files changed, 28 insertions, 1 deletions
diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 9f5f95dfba..8c9bc9e44e 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -106,8 +106,10 @@ class BytesParser: meaning it parses the entire contents of the file. """ fp = TextIOWrapper(fp, encoding='ascii', errors='surrogateescape') - with fp: + try: return self.parser.parse(fp, headersonly) + finally: + fp.detach() def parsebytes(self, text, headersonly=False): diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 2f89a10e0a..af8bc7bf95 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -3390,6 +3390,31 @@ class TestParsers(TestEmailBase): self.assertIsInstance(msg.get_payload(), str) self.assertIsInstance(msg.get_payload(decode=True), bytes) + def test_bytes_parser_does_not_close_file(self): + with openfile('msg_02.txt', 'rb') as fp: + email.parser.BytesParser().parse(fp) + self.assertFalse(fp.closed) + + def test_bytes_parser_on_exception_does_not_close_file(self): + with openfile('msg_15.txt', 'rb') as fp: + bytesParser = email.parser.BytesParser + self.assertRaises(email.errors.StartBoundaryNotFoundDefect, + bytesParser(policy=email.policy.strict).parse, + fp) + self.assertFalse(fp.closed) + + def test_parser_does_not_close_file(self): + with openfile('msg_02.txt', 'r') as fp: + email.parser.Parser().parse(fp) + self.assertFalse(fp.closed) + + def test_parser_on_exception_does_not_close_file(self): + with openfile('msg_15.txt', 'r') as fp: + parser = email.parser.Parser + self.assertRaises(email.errors.StartBoundaryNotFoundDefect, + parser(policy=email.policy.strict).parse, fp) + self.assertFalse(fp.closed) + def test_whitespace_continuation(self): eq = self.assertEqual # This message contains a line after the Subject: header that has only |