mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-132121: Always escape non-printable characters in pygettext (GH-132122)

Browse source
This commit is contained in:
Tomas R. 2025-04-06 22:15:17 +02:00 • committed by GitHub
parent 7bb1e1a236
commit a693eaa710
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_tools/i18n_data/ascii-escapes.pot
View file

@ -41,7 +41,7 @@ msgstr ""
#. some characters in the 128-255 range
#: escapes.py:20
msgid "€   ÿ"
msgid "\302\200 \302\240 ÿ"
msgstr ""
#. some characters >= 256 encoded as 2, 3 and 4 bytes, respectively

1
Misc/NEWS.d/next/Tools-Demos/2025-04-05-14-52-36.gh-issue-132121.QNoDih.rst Normal file
View file

@ -0,0 +1 @@
Always escape non-printable Unicode characters in :program:`pygettext`.

8
Tools/i18n/pygettext.py
View file

@ -190,12 +190,10 @@ def make_escapes(pass_nonascii):
# Allow non-ascii characters to pass through so that e.g. 'msgid
# "Höhe"' would not result in 'msgid "H\366he"'. Otherwise we
# escape any character outside the 32..126 range.
mod = 128
escape = escape_ascii
else:
mod = 256
escape = escape_nonascii
escapes = [r"\%03o" % i for i in range(mod)]
escapes = [r"\%03o" % i for i in range(256)]
for i in range(32, 127):
escapes[i] = chr(i)
escapes[ord('\\')] = r'\\'
@ -206,7 +204,9 @@ def make_escapes(pass_nonascii):
def escape_ascii(s, encoding):
return ''.join(escapes[ord(c)] if ord(c) < 128 else c for c in s)
return ''.join(escapes[ord(c)] if ord(c) < 128 else c
if c.isprintable() else escape_nonascii(c, encoding)
for c in s)
def escape_nonascii(s, encoding):