Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-136702: Deprecate passing non-ascii *encoding* (str) to encodings.normalize_encoding #140030

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
malemburg merged 11 commits into from
Nov 9, 2025
+42 −6
Merged

gh-136702: Deprecate passing non-ascii *encoding* (str) to encodings.normalize_encoding #140030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8fc658
deprecate non-ascii
StanFromIreland Oct 13, 2025
5b50daa
Relocate import
StanFromIreland Oct 13, 2025
95f2e65
sanitize charset names in email
StanFromIreland Oct 13, 2025
fad52cd
Use table, replace with 'ascii'
StanFromIreland Oct 16, 2025
3ac0804
Merge branch 'main' into encodings/non-ascii
StanFromIreland Oct 31, 2025
9d6f06e
Review
StanFromIreland Nov 1, 2025
16697dc
Fix second warning
StanFromIreland Nov 1, 2025
e4036f8
Convert to asserts
StanFromIreland Nov 1, 2025
b8fc5f4
Fix for platforms with ordered tests
StanFromIreland Nov 1, 2025
7592af8
!fixup
StanFromIreland Nov 1, 2025
8c59899
Fix CI on Android and iOS
StanFromIreland Nov 2, 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
Prev Previous commit
Next Next commit
Convert to asserts
  • Loading branch information
@StanFromIreland
StanFromIreland committed Nov 1, 2025
commit e4036f858f8ad56d0d9ba38c5fb2dac06cb9d215
4 changes: 1 addition & 3 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 @@ -5717,9 +5717,7 @@ def test_rfc2231_bad_character_in_encoding(self):

"""
msg = email.message_from_string(m)
import warnings
with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning)
with self.assertWarns(DeprecationWarning):
self.assertEqual(msg.get_filename(), 'myfile.txt')

def test_rfc2231_single_tick_in_filename_extended(self):
Expand Down
8 changes: 2 additions & 6 deletions Lib/test/test_email/test_headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import datetime
import textwrap
import unittest
import warnings
from email import errors
from email import policy
from email.message import Message
Expand Down Expand Up @@ -249,11 +248,8 @@ def content_type_as_value(self,
header = 'Content-Type:' + ' ' if source else ''
folded = args[3] if l>3 else header + decoded + '\n'
# Suppress deprecation warning for rfc2231_nonascii_in_charset_of_charset_parameter_value
if 'utf-8%E2%80%9D' in source:
with warnings.catch_warnings():
warnings.filterwarnings('ignore',
message='Support for non-ascii encoding names',
category=DeprecationWarning)
if 'utf-8%E2%80%9D' in source and not 'ascii' in source:
with self.assertWarns(DeprecationWarning):
h = self.make_header('Content-Type', source)
else:
h = self.make_header('Content-Type', source)
Expand Down
Loading