mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 23:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

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

Browse source 
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 commit d26ee8a0a5)

Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-11-10 17:30:50 -08:00 • committed by GitHub
parent 17f1c0ab06
commit edd92a11ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/tools/extensions/pyspecific.py
View file

@ -26,7 +26,7 @@ try:
from sphinx.errors import NoUri from sphinx.errors import NoUri
except ImportError: except ImportError:
from sphinx.environment import NoUri from sphinx.environment import NoUri
from sphinx.locale import translators from sphinx.locale import _ as sphinx_gettext
from sphinx.util import status_iterator, logging from sphinx.util import status_iterator, logging
from sphinx.util.nodes import split_explicit_title from sphinx.util.nodes import split_explicit_title
from sphinx.writers.text import TextWriter, TextTranslator from sphinx.writers.text import TextWriter, TextTranslator
@ -109,7 +109,7 @@ class ImplementationDetail(Directive):
def run(self): def run(self):
self.assert_has_content() self.assert_has_content()
pnode = nodes.compound(classes=['impl-detail']) pnode = nodes.compound(classes=['impl-detail'])
label = translators['sphinx'].gettext(self.label_text) label = sphinx_gettext(self.label_text)
content = self.content content = self.content
add_text = nodes.strong(label, label) add_text = nodes.strong(label, label)
self.state.nested_parse(content, self.content_offset, pnode) self.state.nested_parse(content, self.content_offset, pnode)
@ -257,7 +257,7 @@ class AuditEvent(Directive):
else: else:
args = [] args = []
label = translators['sphinx'].gettext(self._label[min(2, len(args))]) label = sphinx_gettext(self._label[min(2, len(args))])
text = label.format(name="``{}``".format(name), text = label.format(name="``{}``".format(name),
args=", ".join("``{}``".format(a) for a in args if a)) args=", ".join("``{}``".format(a) for a in args if a))
@ -436,7 +436,7 @@ class DeprecatedRemoved(Directive):
else: else:
label = self._removed_label label = self._removed_label
label = translators['sphinx'].gettext(label) label = sphinx_gettext(label)
text = label.format(deprecated=self.arguments[0], removed=self.arguments[1]) text = label.format(deprecated=self.arguments[0], removed=self.arguments[1])
if len(self.arguments) == 3: if len(self.arguments) == 3:
inodes, messages = self.state.inline_text(self.arguments[2], inodes, messages = self.state.inline_text(self.arguments[2],