Skip to content

gh-134151 Fix TypeError in email.utils.decode_params() when sorting RFC 2231 continuations #134687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 8, 2025
+28 −2
Merged

gh-134151 Fix TypeError in email.utils.decode_params() when sorting RFC 2231 continuations #134687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa95d8e
Fix TypeError in email.utils.decode_params() when sorting RFC 2231 co…
zangjiucheng May 26, 2025
730c3da
Fix sorting logic in decode_params to handle None values correctly an…
zangjiucheng May 26, 2025
73c5ddb
Fix lint
zangjiucheng May 26, 2025
433dea6
Update NEWS entry
zangjiucheng Jun 7, 2025
1a12356
Fix lint
zangjiucheng Jun 7, 2025
eb8c0a8
Addressed Comments
zangjiucheng Jun 7, 2025
d9b2e2e
Format
zangjiucheng Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Lib/email/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,14 @@ def decode_params(params):
for name, continuations in rfc2231_params.items():
value = []
extended = False
# Sort by number
continuations.sort()
# Sort by number, treating None as 0 if there is no 0,
# and ignore it if there is already a 0.
has_zero = any(x[0] == 0 for x in continuations)
if has_zero:
continuations = [x for x in continuations if x[0] is not None]
else:
continuations = [(x[0] or 0, x[1], x[2]) for x in continuations]
continuations.sort(key=lambda x: x[0])
# And now append all values in numerical order, converting
# %-encodings for the encoded segments. If any of the
# continuation names ends in a *, then the entire string, after
Expand Down
18 changes: 18 additions & 0 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,24 @@ def test_bad_param(self):
msg = email.message_from_string("Content-Type: blarg; baz; boo\n")
self.assertEqual(msg.get_param('baz'), '')

def test_continuation_sorting_part_order(self):
msg = email.message_from_string(
"Content-Disposition: attachment; "
"filename*=\"ignored\"; "
"filename*0*=\"utf-8''foo%20\"; "
"filename*1*=\"bar.txt\"\n"
)
filename = msg.get_filename()
self.assertEqual(filename, 'foo bar.txt')

def test_sorting_no_continuations(self):
msg = email.message_from_string(
"Content-Disposition: attachment; "
"filename*=\"bar.txt\"; "
)
filename = msg.get_filename()
self.assertEqual(filename, 'bar.txt')

def test_missing_filename(self):
msg = email.message_from_string("From: foo\n")
self.assertEqual(msg.get_filename(), None)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-05-25-23-23-05.gh-issue-134151.13Wwsb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`email`: Fix :exc:`TypeError` in :func:`email.utils.decode_params`
when sorting :rfc:`2231` continuations that contain an unnumbered section.
Loading