Skip to content

gh-56634: Gettext: raise descriptive ValueErrors instead of IndexErrors for incorrect .mo files metadata #112895

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

gh-56634: Gettext: raise descriptive ValueErrors instead of IndexErrors for incorrect .mo files metadata #112895

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e148f83
gh-56634: Gettext: raise descriptive error on empty plural-forms value
m-aciek Dec 9, 2023
7bfbc5c
Merge branch 'main' into gettext-handle-incorrect-plural-forms
StanFromIreland Aug 20, 2025
c421e4f
Add a ValueError for content-type field
m-aciek Sep 9, 2025
5f56dd6
Add a filename to exception message
m-aciek Sep 9, 2025
c8ae54e
Improve ValueError for invalid plural forms
m-aciek Sep 9, 2025
431fd4c
Add closing quote
m-aciek Sep 9, 2025
5cd3c9f
Add test for content-type
m-aciek Sep 9, 2025
a080729
Fix incorrect MO file bytes in content type test
m-aciek Sep 23, 2025
f6b3a21
News entry with blurb
m-aciek Sep 25, 2025
f69c9ab
Change error messages
m-aciek Sep 25, 2025
f512131
Improve plural forms error message, add a test
m-aciek Sep 25, 2025
6fff70c
Support Windows in tests
m-aciek Sep 26, 2025
121ec1f
Fix Windows tests: escape backslashes
m-aciek Sep 26, 2025
12225ec
Fix Windows tests: mark path string as raw
m-aciek Sep 26, 2025
702b84a
Update Misc/NEWS.d/next/Library/2025-09-25-21-13-59.gh-issue-56634.8t…
m-aciek Oct 1, 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
5 changes: 4 additions & 1 deletion Lib/gettext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,10 @@ def _parse(self, fp):
self._charset = v.split('charset=')[1]
elif k == 'plural-forms':
v = v.split(';')
plural = v[1].split('plural=')[1]
try:
plural = v[1].split('plural=')[1]
except IndexError as e:
raise ValueError('invalid plural forms syntax') from e
self.plural = c2py(plural)
# Note: we unconditionally convert both msgids and msgstrs to
# Unicode using the character encoding specified in the charset
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_gettext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,22 @@ def test_ignore_comments_in_headers_issue36239(self):
t = gettext.GNUTranslations(fp)
self.assertEqual(t.info()["plural-forms"], "nplurals=2; plural=(n != 1);")

def test_raise_descriptive_error_for_incorrect_plural_forms(self):
with open(MOFILE, 'wb') as fp:
# below is msgfmt run on such a PO file:
# msgid ""
# msgstr ""
# "Content-Type: text/plain; charset=UTF-8\n"
# "Plural-Forms: \n"
fp.write(
b'\xde\x12\x04\x95\x00\x00\x00\x00\x01\x00\x00\x00\x1c\x00\x00\x00$\x00\x00\x00\x03\x00\x00\x00,\x00'
b'\x00\x00\x00\x00\x00\x008\x00\x00\x007\x00\x00\x009\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00'
b'\x00\x00\x00\x00Content-Type: text/plain; charset=UTF-8\nPlural-Forms: \n\x00'
)
with self.assertRaisesRegex(ValueError, "invalid plural forms syntax"):
with open(MOFILE, 'rb') as fp:
gettext.GNUTranslations(fp)


class UnicodeTranslationsTest(GettextBaseTest):
def setUp(self):
Expand Down
Loading