bpo-40798: Generate a different message for already removed elements … · python/cpython@735d902 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 735d902

Browse filesBrowse the repository at this point in the historyBrowse files

DahlitzFlorian

authored

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

1 parent 4649202 commit 735d902
Copy full SHA for 735d902

2 files changed

+12-2Lines changed: 12 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Doc/tools
  • extensions
    • pyspecific.py
  • templates
    • dummy.html

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Doc/tools/extensions/pyspecific.py‎

Copy file name to clipboardExpand all lines: Doc/tools/extensions/pyspecific.py

+11-2Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -311,15 +311,24 @@ class DeprecatedRemoved(Directive):
311	311	final_argument_whitespace = True
312	312	option_spec = {}
313	313
314		- _label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
	314	+ _deprecated_label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
	315	+ _removed_label = 'Deprecated since version {deprecated}, removed in version {removed}'
315	316
316	317	def run(self):
317	318	node = addnodes.versionmodified()
318	319	node.document = self.state.document
319	320	node['type'] = 'deprecated-removed'
320	321	version = (self.arguments[0], self.arguments[1])
321	322	node['version'] = version
322		- label = translators['sphinx'].gettext(self._label)
	323	+ env = self.state.document.settings.env
	324	+ current_version = tuple(int(e) for e in env.config.version.split('.'))
	325	+ removed_version = tuple(int(e) for e in self.arguments[1].split('.'))
	326	+ if current_version < removed_version:
	327	+ label = self._deprecated_label
	328	+ else:
	329	+ label = self._removed_label
	330	+
	331	+ label = translators['sphinx'].gettext(label)
323	332	text = label.format(deprecated=self.arguments[0], removed=self.arguments[1])
324	333	if len(self.arguments) == 3:
325	334	inodes, messages = self.state.inline_text(self.arguments[2],

Collapse file

‎Doc/tools/templates/dummy.html‎

Copy file name to clipboardExpand all lines: Doc/tools/templates/dummy.html

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -5,3 +5,4 @@
5	5
6	6	{% trans %}CPython implementation detail:{% endtrans %}
7	7	{% trans %}Deprecated since version {deprecated}, will be removed in version {removed}{% endtrans %}
	8	+ {% trans %}Deprecated since version {deprecated}, removed in version {removed}{% endtrans %}

0 commit comments

Comments

0 (0)