NotificationsYou must be signed in to change notification settings
Fork32k
Star67.3k

gh-98366: use sphinx.locale._ as gettext() in pyspecific.py#98437

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

ezio-melotti merged 1 commit intopython:mainfrommattwang44:fix-pyspecific-sphinx-locale-gettext

Nov 11, 2022

Merged

gh-98366: use sphinx.locale._ as gettext() in pyspecific.py#98437

ezio-melotti merged 1 commit intopython:mainfrommattwang44:fix-pyspecific-sphinx-locale-gettext

Nov 11, 2022

Conversation

Copy link

Contributor

mattwang44 commentedOct 19, 2022•
edited
Loading

sphinx 5.3 changedsphinx.locale.translators from adefaultdict(gettext.NullTranslations) to adict (commit), which led to failure of pyspecific.py. Usesphinx.locale._ asgettext() to fix the issue.

Issue:Python 3.10.7 Docs fails with Sphinx 5.3.0 #98366

bedevere-bot added the awaiting review label

Oct 19, 2022

Copy link

bedevere-bot commentedOct 19, 2022

Most changes to Pythonrequire a NEWS entry.

Please add it using theblurb_it web app or theblurb command-line tool.

mattwang44 marked this pull request as draft

October 19, 2022 07:09

mattwang44 marked this pull request as ready for review

October 19, 2022 07:38

mattwang44 commented

Oct 19, 2022

View reviewed changes

Misc/NEWS.d/next/Documentation/2022-10-19-07-15-52.gh-issue-98366.UskMXF.rst OutdatedShow resolvedHide resolved

AlexWaygood added the docsDocumentation in the Doc dir label

Oct 19, 2022

mattwang44 mentioned this pull request

Oct 21, 2022

fix(Makefile): fallback sphinx version to <5.3python/python-docs-zh-tw#330

Merged

Copy link

marxin commentedOct 21, 2022

May I please ping this, it's blockingSphinx5.3 update in openSUSE CI right now.

Copy link

Contributor

mcepl commentedOct 21, 2022

May I please ping this, it's blockingSphinx5.3 update in openSUSE CI right now.

@ezio-melotti,@merwok,@JulienPalard,@willingc You are enlisted onhttps://devguide.python.org/core-developers/experts/ as experts for documentation. Could you please review this PR? Thank you.

merwok added the skip news label

Oct 21, 2022

mattwang44 force-pushed thefix-pyspecific-sphinx-locale-gettext branch fromf22bc2b to5775f51Compare

October 21, 2022 15:02

fix(doc-tools): use sphinx.locale._ as gettext() for backward-compati…

383f9a7

…bility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.

mattwang44 force-pushed thefix-pyspecific-sphinx-locale-gettext branch from5775f51 to383f9a7Compare

October 21, 2022 15:03

mattwang44 requested a review frommerwok

October 21, 2022 15:05

AlexWaygood requested a review fromAA-Turner

October 21, 2022 15:29

Copy link

Member

AA-Turner commentedOct 21, 2022

Desk review looks reasonable, though ideally we'd confirm by building one of the translations against this PR.

AA-Turner approved these changes

Oct 21, 2022

View reviewed changes

bedevere-bot added awaiting core review and removed awaiting review labels

Oct 21, 2022

Copy link

Member

AlexWaygood commentedOct 21, 2022

ideally we'd confirm by building one of the translations against this PR.

@mattwang44, are you able to do that?

Copy link

ContributorAuthor

mattwang44 commentedOct 21, 2022•
edited
Loading

@AA-Turner @AlexWaygood
APR inpython-docs-zh-tw for testing this branch with sphinx==5.3 is created andthe building job has passed.

Copy link

Member

AA-Turner commentedOct 21, 2022

Great that the build passed. Is the translation correct for implementation detail directives, to sanity check that the new code works?

Copy link

ContributorAuthor

mattwang44 commentedOct 23, 2022

Great that the build passed. Is the translation correct for implementation detail directives, to sanity check that the new code works?
A

The static site of translated doc in zh_TW has been deployed to theGitHub page (GitHub Action logs ishere). I've checked a couple of recently-merged translation PRs and it looks fine to me.

ezio-melotti approved these changes

Nov 11, 2022

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels

Nov 11, 2022

ezio-melotti merged commitd26ee8a intopython:main

Nov 11, 2022

bedevere-bot removed the awaiting merge label

Nov 11, 2022

Copy link

Member

ezio-melotti commentedNov 11, 2022

Should this be backported to3.11 and3.10 too?

Copy link

Member

AA-Turner commentedNov 11, 2022

Yes!

AlexWaygood added needs backport to 3.10

only security fixes

needs backport to 3.11only security fixes labels

Nov 11, 2022

Copy link

Contributor

miss-islington commentedNov 11, 2022

Thanks@mattwang44 for the PR, and@ezio-melotti for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

Copy link

Contributor

miss-islington commentedNov 11, 2022

Thanks@mattwang44 for the PR, and@ezio-melotti for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request

Nov 11, 2022

pythongh-98366: use sphinx.locale._ as gettext() in pyspecific.py (py…

192a19b

…thonGH-98437)fix(doc-tools): use sphinx.locale._ as gettext() for backward-compatibility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.(cherry picked from commitd26ee8a)Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

Copy link

bedevere-bot commentedNov 11, 2022

GH-99358 is a backport of this pull request to the3.10 branch.

bedevere-bot removed the needs backport to 3.10only security fixes label

Nov 11, 2022

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request

Nov 11, 2022

pythongh-98366: use sphinx.locale._ as gettext() in pyspecific.py (py…

30e4636

…thonGH-98437)fix(doc-tools): use sphinx.locale._ as gettext() for backward-compatibility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.(cherry picked from commitd26ee8a)Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

Copy link

bedevere-bot commentedNov 11, 2022

GH-99359 is a backport of this pull request to the3.11 branch.

bedevere-bot removed the needs backport to 3.11only security fixes label

Nov 11, 2022

miss-islington added a commit that referenced this pull request

Nov 11, 2022

gh-98366: use sphinx.locale._ as gettext() in pyspecific.py (GH-98437)

edd92a1

fix(doc-tools): use sphinx.locale._ as gettext() for backward-compatibility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.(cherry picked from commitd26ee8a)Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

miss-islington added a commit that referenced this pull request

Nov 11, 2022

gh-98366: use sphinx.locale._ as gettext() in pyspecific.py (GH-98437)

5612471

fix(doc-tools): use sphinx.locale._ as gettext() for backward-compatibility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.(cherry picked from commitd26ee8a)Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

mattwang44 deleted the fix-pyspecific-sphinx-locale-gettext branch

November 12, 2022 06:37

ethanfurman pushed a commit to ethanfurman/cpython that referenced this pull request

Nov 12, 2022

pythongh-98366: use sphinx.locale._ as gettext() in pyspecific.py (py…

26bf876

…thon#98437)fix(doc-tools): use sphinx.locale._ as gettext() for backward-compatibility in pyspecific.py[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.