diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-05-30 07:54:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 07:54:28 (GMT) |
| commit | 588efc29c5dc4ffaac116a214d13cca936e346a9 (patch) | |
| tree | ef604ba686f89f1604d92da933f8622a3f85ff7b | |
| parent | 78cf711d1ff261b6be359d6c12f47dd0997546b2 (diff) | |
| download | cpython-588efc29c5dc4ffaac116a214d13cca936e346a9.zip cpython-588efc29c5dc4ffaac116a214d13cca936e346a9.tar.gz cpython-588efc29c5dc4ffaac116a214d13cca936e346a9.tar.bz2 | |
bpo-40798: Generate a different message for already removed elements (GH-20483)
(cherry picked from commit 735d902b363b759df9ff00e58bbf4f7e2bde78cd)
Co-authored-by: Florian Dahlitz <f2dahlitz@freenet.de>
| -rw-r--r-- | Doc/tools/extensions/pyspecific.py | 13 | ||||
| -rw-r--r-- | Doc/tools/templates/dummy.html | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index 6751f01..f08f4ab 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -311,7 +311,8 @@ class DeprecatedRemoved(Directive): final_argument_whitespace = True 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): node = addnodes.versionmodified() @@ -319,7 +320,15 @@ class DeprecatedRemoved(Directive): node['type'] = 'deprecated-removed' version = (self.arguments[0], self.arguments[1]) 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]) if len(self.arguments) == 3: inodes, messages = self.state.inline_text(self.arguments[2], diff --git a/Doc/tools/templates/dummy.html b/Doc/tools/templates/dummy.html index 8d94137..68ae3ad 100644 --- a/Doc/tools/templates/dummy.html +++ b/Doc/tools/templates/dummy.html @@ -5,3 +5,4 @@ In extensions/pyspecific.py: {% trans %}CPython implementation detail:{% endtrans %} {% trans %}Deprecated since version {deprecated}, will be removed in version {removed}{% endtrans %} +{% trans %}Deprecated since version {deprecated}, removed in version {removed}{% endtrans %} |