Skip to content

Commit

Permalink
gh-98366: use sphinx.locale._ as gettext() in pyspecific.py (GH-98437)
Browse files Browse the repository at this point in the history
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 d26ee8a)

Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>
  • Loading branch information
miss-islington and mattwang44 committed Nov 11, 2022
1 parent 17f1c0a commit edd92a1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Doc/tools/extensions/pyspecific.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from sphinx.errors import NoUri
except ImportError:
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.nodes import split_explicit_title
from sphinx.writers.text import TextWriter, TextTranslator
Expand Down Expand Up @@ -109,7 +109,7 @@ class ImplementationDetail(Directive):
def run(self):
self.assert_has_content()
pnode = nodes.compound(classes=['impl-detail'])
label = translators['sphinx'].gettext(self.label_text)
label = sphinx_gettext(self.label_text)
content = self.content
add_text = nodes.strong(label, label)
self.state.nested_parse(content, self.content_offset, pnode)
Expand Down Expand Up @@ -257,7 +257,7 @@ def run(self):
else:
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),
args=", ".join("``{}``".format(a) for a in args if a))

Expand Down Expand Up @@ -436,7 +436,7 @@ def run(self):
else:
label = self._removed_label

label = translators['sphinx'].gettext(label)
label = sphinx_gettext(label)
text = label.format(deprecated=self.arguments[0], removed=self.arguments[1])
if len(self.arguments) == 3:
inodes, messages = self.state.inline_text(self.arguments[2],
Expand Down

0 comments on commit edd92a1

Please sign in to comment.