Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
htsedebenham 2023-07-23 11:25:18 +01:00 committed by GitHub
parent 54632528ee
commit c65592c4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/email/feedparser.py
View File

@ -189,7 +189,7 @@ class FeedParser:
assert not self._msgstack assert not self._msgstack
# Look for final set of defects # Look for final set of defects
if root.get_content_maintype() == 'multipart' \ if root.get_content_maintype() == 'multipart' \
and not root.is_multipart(): and not root.is_multipart() and not self._headersonly:
defect = errors.MultipartInvariantViolationDefect() defect = errors.MultipartInvariantViolationDefect()
self.policy.handle_defect(root, defect) self.policy.handle_defect(root, defect)
return root 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(), str)
self.assertIsInstance(msg.get_payload(decode=True), bytes) 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): def test_bytes_parser_does_not_close_file(self):
with openfile('msg_02.txt', 'rb') as fp: with openfile('msg_02.txt', 'rb') as fp:
email.parser.BytesParser().parse(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``.