https://github.com/python/cpython/commit/4762b365406a8cf026a4a4ddcae34c28a41c3de9
commit: 4762b365406a8cf026a4a4ddcae34c28a41c3de9
branch: 3.11
author: Serhiy Storchaka <[email protected]>
committer: pablogsal <[email protected]>
date: 2024-05-23T13:09:03+01:00
summary:
[3.11] gh-118643: Fix AttributeError in the email module (GH-119099) (#119393)
Fix regression introduced in gh-100884: AttributeError when re-fold a long
address list.
Also fix more cases of incorrect encoding of the address separator in the
address list missed in gh-100884.
(cherry picked from commit 858b9e85fcdd495947c9e892ce6e3734652c48f2)
files:
A Misc/NEWS.d/next/Library/2024-05-16-17-31-46.gh-issue-118643.hAWH4C.rst
M Lib/email/_header_value_parser.py
M Lib/test/test_email/test__header_value_parser.py
diff --git a/Lib/email/_header_value_parser.py
b/Lib/email/_header_value_parser.py
index 8cb8852cf0b7ab..67e1fcb48ebc08 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -950,6 +950,7 @@ class _InvalidEwError(errors.HeaderParseError):
DOT = ValueTerminal('.', 'dot')
ListSeparator = ValueTerminal(',', 'list-separator')
ListSeparator.as_ew_allowed = False
+ListSeparator.syntactic_break = False
RouteComponentMarker = ValueTerminal('@', 'route-component-marker')
#
@@ -2821,7 +2822,9 @@ def _refold_parse_tree(parse_tree, *, policy):
if not hasattr(part, 'encode'):
# It's not a Terminal, do each piece individually.
parts = list(part) + parts
- else:
+ want_encoding = False
+ continue
+ elif part.as_ew_allowed:
# It's a terminal, wrap it as an encoded word, possibly
# combining it with previously encoded words if allowed.
if (last_ew is not None and
@@ -2832,8 +2835,15 @@ def _refold_parse_tree(parse_tree, *, policy):
last_ew = _fold_as_ew(tstr, lines, maxlen, last_ew,
part.ew_combine_allowed, charset)
last_charset = charset
- want_encoding = False
- continue
+ want_encoding = False
+ continue
+ else:
+ # It's a terminal which should be kept non-encoded
+ # (e.g. a ListSeparator).
+ last_ew = None
+ want_encoding = False
+ # fall through
+
if len(tstr) <= maxlen - len(lines[-1]):
lines[-1] += tstr
continue
diff --git a/Lib/test/test_email/test__header_value_parser.py
b/Lib/test/test_email/test__header_value_parser.py
index f7e80749c456f8..0d9343478ce7f3 100644
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -2986,9 +2986,17 @@ def test_address_list_with_unicode_names_in_quotes(self):
' =?utf-8?q?bei=C3=9Ft_bei=C3=9Ft?= <[email protected]>\n')
def test_address_list_with_list_separator_after_fold(self):
- to = '0123456789' * 8 + '@foo, ä <foo@bar>'
+ a = 'x' * 66 + '@example.com'
+ to = f'{a}, "Hübsch Kaktus" <[email protected]>'
self._test(parser.get_address_list(to)[0],
- '0123456789' * 8 + '@foo,\n =?utf-8?q?=C3=A4?= <foo@bar>\n')
+ f'{a},\n =?utf-8?q?H=C3=BCbsch?= Kaktus <[email protected]>\n')
+
+ a = '.' * 79
+ to = f'"{a}" <[email protected]>, "Hübsch Kaktus"
<[email protected]>'
+ self._test(parser.get_address_list(to)[0],
+ f'{a}\n'
+ ' <[email protected]>, =?utf-8?q?H=C3=BCbsch?= Kaktus '
+ '<[email protected]>\n')
# XXX Need tests with comments on various sides of a unicode token,
# and with unicode tokens in the comments. Spaces inside the quotes
diff --git
a/Misc/NEWS.d/next/Library/2024-05-16-17-31-46.gh-issue-118643.hAWH4C.rst
b/Misc/NEWS.d/next/Library/2024-05-16-17-31-46.gh-issue-118643.hAWH4C.rst
new file mode 100644
index 00000000000000..e86a49af74c9d6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-05-16-17-31-46.gh-issue-118643.hAWH4C.rst
@@ -0,0 +1,2 @@
+Fix an AttributeError in the :mod:`email` module when re-fold a long address
+list. Also fix more cases of incorrect encoding of the address separator in
the address list.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
