Commitafa24d5

and

authored

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

(cherry picked from commitc65592c)Co-authored-by: htsedebenham <31847376+htsedebenham@users.noreply.github.com>

1 parentd2cdf08 commitafa24d5Copy full SHA for afa24d5

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ def close(self):`
`189`	`189`	`assertnotself._msgstack`
`190`	`190`	`# Look for final set of defects`
`191`	`191`	`ifroot.get_content_maintype()=='multipart' \`
`192`		`-andnotroot.is_multipart():`
	`192`	`+andnotroot.is_multipart()andnotself._headersonly:`
`193`	`193`	`defect=errors.MultipartInvariantViolationDefect()`
`194`	`194`	`self.policy.handle_defect(root,defect)`
`195`	`195`	`returnroot`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+Date: 01 Jan 2001 00:01+0000`
	`2`	`+From: arthur@example.example`
	`3`	`+MIME-Version: 1.0`
	`4`	`+Content-Type: multipart/mixed; boundary=foo`
	`5`	`+`
	`6`	`+--foo`
	`7`	`+Content-Type: text/plain`
	`8`	`+bar`
	`9`	`+`
	`10`	`+--foo`
	`11`	`+Content-Type: text/html`
	`12`	`+<html><body><p>baz</p></body></html>`
	`13`	`+`
	`14`	`+--foo--`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3696,6 +3696,16 @@ def test_bytes_header_parser(self):`
`3696`	`3696`	`self.assertIsInstance(msg.get_payload(),str)`
`3697`	`3697`	`self.assertIsInstance(msg.get_payload(decode=True),bytes)`
`3698`	`3698`
	`3699`	`+deftest_header_parser_multipart_is_valid(self):`
	`3700`	`+# Don't flag valid multipart emails as having defects`
	`3701`	`+withopenfile('msg_47.txt',encoding="utf-8")asfp:`
	`3702`	`+msgdata=fp.read()`
	`3703`	`+`
	`3704`	`+parser=email.parser.Parser(policy=email.policy.default)`
	`3705`	`+parsed_msg=parser.parsestr(msgdata,headersonly=True)`
	`3706`	`+`
	`3707`	`+self.assertEqual(parsed_msg.defects, [])`
	`3708`	`+`
`3699`	`3709`	`deftest_bytes_parser_does_not_close_file(self):`
`3700`	`3710`	`withopenfile('msg_02.txt','rb')asfp:`
`3701`	`3711`	`email.parser.BytesParser().parse(fp)`

Lines changed: 3 additions & 0 deletions

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

Comments

(0)