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.

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

[3.13] gh-126413: Add translation tests for getopt and optparse (GH-126698) #126755

Merged
merged 2 commits into from
Nov 15, 2024

Conversation

tomasr8
Copy link
Member

@tomasr8 tomasr8 commented Nov 12, 2024

…pythonGH-126698)

(cherry picked from commit dff074d)

Co-authored-by: Tomas R. <tomas.roun8@gmail.com>
@tomasr8
Copy link
Member Author

tomasr8 commented Nov 12, 2024

I'm looking into the test failures

@tomasr8
Copy link
Member Author

tomasr8 commented Nov 12, 2024

Looks like pygettext is getting tripped up by this:

def _(s): return s

This was removed by another PR of mine which was not backported: #126358 (which is why this did not fail on main)
Perhaps we could backport it to fix this issue for now? A more definitive fix would be to update pygettext to not get confused by def _(...)

@serhiy-storchaka What do you think?

@serhiy-storchaka
Copy link
Member

I think that changing pygettext is more preferable. This will benefit not only us, but all users.

But if it is non-trivial, backporting #126358 is the second good option.

@tomasr8
Copy link
Member Author

tomasr8 commented Nov 12, 2024

I think that changing pygettext is more preferable. This will benefit not only us, but all users.

But if it is non-trivial, backporting #126358 is the second good option.

I agree that fixing this in pygettext is better, I'm gonna see if I can come up with a simple fix

@tomasr8
Copy link
Member Author

tomasr8 commented Nov 12, 2024

I think I found a pretty simple fix, I'll send a PR tomorrow :)

@tomasr8
Copy link
Member Author

tomasr8 commented Nov 15, 2024

CI's looking good now both here and on the 3.12 backport #126756 🙂 @serhiy-storchaka

Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

Thanks.

@serhiy-storchaka serhiy-storchaka merged commit 1c15870 into python:3.13 Nov 15, 2024
37 checks passed
@tomasr8 tomasr8 deleted the backport-dff074d-3.13 branch November 15, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants