gh-130453: pygettext: Extend support for specifying custom keywords #130463
+228
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
serhiy-storchaka
approved these changes
Feb 23, 2025
Comment on lines
+355
to
+356
| for k, v in result.items(): | ||
| if v == pos: |
There was a problem hiding this comment.
if pos in result.values():
| raise ValueError(f'Invalid keyword spec {spec!r}: ' | ||
| 'msgctxt cannot appear without msgid') | ||
|
|
||
| return name, {v: k for k, v in result.items()} |
There was a problem hiding this comment.
Would it be simpler to build result in that form from the beginning?
| try: | ||
| options.keywords = dict(parse_spec(spec) for spec in options.keywords) | ||
| except ValueError as e: | ||
| raise SystemExit(e) |
There was a problem hiding this comment.
Other errors cause print() + sys.exit(1).
| @@ -602,7 +685,7 @@ class Options: | |||
| elif opt in ('-D', '--docstrings'): | |||
| options.docstrings = 1 | |||
| elif opt in ('-k', '--keyword'): | |||
| options.keywords.append(arg) | |||
| options.keywords.add(arg) | |||
There was a problem hiding this comment.
What if you specify the same name twice with different specs? --keyword=gt:1 --keyword=gt:2? Set does not preserve order, so the end result is unpredicable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses the first point in #130453
It is now possible to use the full keyword spec syntax (except for
t, that will be added later) to specify keywords:I tried to match the behaviour of xgettext and babel but neither seem to do much validation for the keyword specs.
xgettext, for instance, does not allow
foo:1c,2c(context specified twice) norfoo:1,1c(msgidandmsgctxthave the same index) but it does (weirdly) allowfoo:1,1(same index formsgidandmsgid_plural), whereas it outright crashes with a double free forfoo:1,1,2c.This PR properly validates the keyword specs in order to be consistent and provide helpful error messages to the user.
Feedback welcome!