mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-106186: Don't report MultipartInvariantViolationDefect for valid multipart emails when parsing header only (GH-107016) (#107111)

Browse source 
(cherry picked from commit c65592c4d6)

Co-authored-by: htsedebenham <31847376+htsedebenham@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2023-07-23 05:28:28 -07:00 • committed by GitHub
parent 95a82dcbe7
commit af95a1da46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/email/feedparser.py
View file

@ -187,7 +187,7 @@ class FeedParser:
assert not self._msgstack
# Look for final set of defects
if root.get_content_maintype() == 'multipart' \
and not root.is_multipart():
and not root.is_multipart() and not self._headersonly:
defect = errors.MultipartInvariantViolationDefect()
self.policy.handle_defect(root, defect)
return root

14
Lib/test/test_email/data/msg_47.txt Normal file
View file

@ -0,0 +1,14 @@
Date: 01 Jan 2001 00:01+0000
From: arthur@example.example
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=foo
--foo
Content-Type: text/plain
bar
--foo
Content-Type: text/html
<html><body><p>baz</p></body></html>
--foo--

10
Lib/test/test_email/test_email.py
View file

@ -3712,6 +3712,16 @@ class TestParsers(TestEmailBase):
self.assertIsInstance(msg.get_payload(), str)
self.assertIsInstance(msg.get_payload(decode=True), bytes)
def test_header_parser_multipart_is_valid(self):
# Don't flag valid multipart emails as having defects
with openfile('msg_47.txt', encoding="utf-8") as fp:
msgdata = fp.read()
parser = email.parser.Parser(policy=email.policy.default)
parsed_msg = parser.parsestr(msgdata, headersonly=True)
self.assertEqual(parsed_msg.defects, [])
def test_bytes_parser_does_not_close_file(self):
with openfile('msg_02.txt', 'rb') as fp:
email.parser.BytesParser().parse(fp)

3
Misc/NEWS.d/next/Library/2023-07-22-13-09-28.gh-issue-106186.EIsUNG.rst Normal file
View file

@ -0,0 +1,3 @@
Do not report ``MultipartInvariantViolationDefect`` defect
when the :class:`email.parser.Parser` class is used
to parse emails with ``headersonly=True``.