mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

bpo-40798: Generate a different message for already removed elements (GH-20483)

Browse source 
(cherry picked from commit 735d902b36)

Co-authored-by: Florian Dahlitz <f2dahlitz@freenet.de>
This commit is contained in:
Miss Islington (bot) 2020-05-30 00:54:28 -07:00 • committed by GitHub
parent 78cf711d1f
commit 588efc29c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -311,7 +311,8 @@ class DeprecatedRemoved(Directive):
final_argument_whitespace = True final_argument_whitespace = True
option_spec = {} option_spec = {}
_label = 'Deprecated since version {deprecated}, will be removed in version {removed}' _deprecated_label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
_removed_label = 'Deprecated since version {deprecated}, removed in version {removed}'
def run(self): def run(self):
node = addnodes.versionmodified() node = addnodes.versionmodified()
@ -319,7 +320,15 @@ class DeprecatedRemoved(Directive):
node['type'] = 'deprecated-removed' node['type'] = 'deprecated-removed'
version = (self.arguments[0], self.arguments[1]) version = (self.arguments[0], self.arguments[1])
node['version'] = version node['version'] = version
label = translators['sphinx'].gettext(self._label) env = self.state.document.settings.env
current_version = tuple(int(e) for e in env.config.version.split('.'))
removed_version = tuple(int(e) for e in self.arguments[1].split('.'))
if current_version < removed_version:
label = self._deprecated_label
else:
label = self._removed_label
label = translators['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],

1
Doc/tools/templates/dummy.html
View file

@ -5,3 +5,4 @@ In extensions/pyspecific.py:
{% trans %}CPython implementation detail:{% endtrans %} {% trans %}CPython implementation detail:{% endtrans %}
{% trans %}Deprecated since version {deprecated}, will be removed in version {removed}{% endtrans %} {% trans %}Deprecated since version {deprecated}, will be removed in version {removed}{% endtrans %}
{% trans %}Deprecated since version {deprecated}, removed in version {removed}{% endtrans %}