Skip to content

Commit 3ce49be

Browse files
committed
Address review comments
1 parent b7bfacb commit 3ce49be

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Lib/email/_policybase.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
'compat32',
1616
]
1717

18+
# equivalent to pattern re.compile("[!-9;-~]+$")
1819
valid_header_name_re = re.compile("[\041-\071\073-\176]+$")
1920

2021
def validate_header_name(name):
2122
# Validate header name according to RFC 5322
2223
if not valid_header_name_re.match(name):
23-
raise ValueError(f"Header field name contains invalid characters: {name!r}")
24+
raise ValueError(
25+
f"Header field name contains invalid characters: {name!r}")
2426

2527
class _PolicyBase:
2628

Lib/test/test_email/test_message.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,11 +1024,14 @@ def test_invalid_header_names(self):
10241024
policy=thispolicy.__class__.__name__,
10251025
method=method,
10261026
):
1027-
with self.assertRaises(ValueError) as cm:
1028-
getattr(EmailMessage(policy=thispolicy), method)(name, value)
1029-
msg = str(cm.exception)
1030-
self.assertRegex( msg, '(?i)(?=.*invalid)(?=.*header)(?=.*name)')
1031-
self.assertIn(f"{name!r}", msg)
1027+
message = EmailMessage(policy=thispolicy)
1028+
method = getattr(message, method)
1029+
with self.assertRaisesRegex(
1030+
ValueError,
1031+
'(?i)(?=.*invalid)(?=.*header)(?=.*name)'
1032+
) as cm:
1033+
method(name,value)
1034+
self.assertIn(f"{name!r}", str(cm.exception))
10321035

10331036
def test_get_body_malformed(self):
10341037
"""test for bpo-42892"""

0 commit comments

Comments
 (0)