Skip to content
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

Jump to bottom

Fix of list index out of range error in PoFileParser.add_message when translations is empty #1135

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Fix of list index out of range error in PoFileParser.add_message when translations is empty #1135

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c6bdd65
Fix of index out of bounds error in add_message when translations is …
gabe-sherman Sep 25, 2024
7ede067
small change of error message
gabe-sherman Sep 25, 2024
700eccd
Update translations check in babel/messages/pofile.py
gabe-sherman Sep 26, 2024
d1aa71d
added a more descriptive error message
gabe-sherman Sep 26, 2024
9d1d5b3
updated error message and added test in test_pofile.py
gabe-sherman Sep 26, 2024
e50d106
Merge branch 'PoFileParser_Patch' of https://github.com/gabe-sherman/…
gabe-sherman Sep 26, 2024
9535041
improved test input to ensure error message is accurate for the corre…
gabe-sherman Sep 26, 2024
2eec963
Update babel/messages/pofile.py
gabe-sherman Oct 1, 2024
3b08f79
Update tests/messages/test_pofile.py
gabe-sherman Oct 1, 2024
71dfd0e
additional test cases added for issue 1134
gabe-sherman Oct 1, 2024
a6c9b58
cleanup of whitespace
gabe-sherman Oct 1, 2024
5936e59
Update tests/messages/test_pofile.py
gabe-sherman Oct 2, 2024
bff400a
Update tests/messages/test_pofile.py
gabe-sherman Oct 2, 2024
aa917b8
additional testing updates
gabe-sherman Oct 2, 2024
64b8437
Merge branch 'PoFileParser_Patch' of https://github.com/gabe-sherman/…
gabe-sherman Oct 2, 2024
546503b
adding new line to test_pofile.py
gabe-sherman Oct 2, 2024
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
3 changes: 3 additions & 0 deletions babel/messages/pofile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ def _add_message(self) -> None:

def _finish_current_message(self) -> None:
if self.messages:
if not self.translations:
self.translations.append([0, _NormalizedString("")])
self._invalid_pofile("", self.offset, f"missing msgstr for msgid: '{self.messages[0].denormalize()}'")
gabe-sherman marked this conversation as resolved.
Show resolved Hide resolved
self._add_message()

def _process_message_line(self, lineno, line, obsolete=False) -> None:
Expand Down
7 changes: 7 additions & 0 deletions tests/messages/test_pofile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,3 +1014,10 @@ def test_issue_1087():
"Language: \n"
''')
assert pofile.read_po(buf).locale is None

def test_issue_1134():
buf = StringIO('''msgid "this is an invalid po file"
msgstr "hello world"
msgid "msgid without str"''')
gabe-sherman marked this conversation as resolved.
Show resolved Hide resolved
with pytest.raises(pofile.PoFileError):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PoFileError is raised for various reasons, I'd also assert that the exception message matches ours:

with pytest.raises(pofile.PoFileError) as excinfo:
    pofile.read_po(buf, abort_invalid=True)
assert str(excinfo.value) == "..."

pofile.read_po(buf, abort_invalid=True)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd also add a test when abort_invalid is False and maybe one test when the input includes msgid_plural e.g.

msgid "foo"
msgid_plural "foos"

(Also, there's a missing newline at the end of this file ;))