Skip to content

Commit 2c910c1

Browse files
JulienPalardgpshead
authored andcommitted
bpo-36675: Remove obsolete code. (GH-16024)
Does no longer work since Sphinx moved the trim_doctest_flag option in the configuration.
1 parent 894d0f7 commit 2c910c1

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

Doc/library/doctest.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
:keepdoctest:
2-
31
:mod:`doctest` --- Test interactive Python examples
42
===================================================
53

Doc/tools/extensions/pyspecific.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from sphinx.locale import translators
3030
from sphinx.util import status_iterator, logging
3131
from sphinx.util.nodes import split_explicit_title
32-
from sphinx.writers.html import HTMLTranslator
3332
from sphinx.writers.text import TextWriter, TextTranslator
3433
from sphinx.writers.latex import LaTeXTranslator
3534
from sphinx.domains.python import PyModulelevel, PyClassmember
@@ -49,37 +48,6 @@
4948
Body.enum.converters['lowerroman'] = \
5049
Body.enum.converters['upperroman'] = lambda x: None
5150

52-
# monkey-patch HTML and LaTeX translators to keep doctest blocks in the
53-
# doctest docs themselves
54-
orig_visit_literal_block = HTMLTranslator.visit_literal_block
55-
orig_depart_literal_block = LaTeXTranslator.depart_literal_block
56-
57-
58-
def new_visit_literal_block(self, node):
59-
meta = self.builder.env.metadata[self.builder.current_docname]
60-
old_trim_doctest_flags = self.highlighter.trim_doctest_flags
61-
if 'keepdoctest' in meta:
62-
self.highlighter.trim_doctest_flags = False
63-
try:
64-
orig_visit_literal_block(self, node)
65-
finally:
66-
self.highlighter.trim_doctest_flags = old_trim_doctest_flags
67-
68-
69-
def new_depart_literal_block(self, node):
70-
meta = self.builder.env.metadata[self.curfilestack[-1]]
71-
old_trim_doctest_flags = self.highlighter.trim_doctest_flags
72-
if 'keepdoctest' in meta:
73-
self.highlighter.trim_doctest_flags = False
74-
try:
75-
orig_depart_literal_block(self, node)
76-
finally:
77-
self.highlighter.trim_doctest_flags = old_trim_doctest_flags
78-
79-
80-
HTMLTranslator.visit_literal_block = new_visit_literal_block
81-
LaTeXTranslator.depart_literal_block = new_depart_literal_block
82-
8351

8452
# Support for marking up and linking to bugs.python.org issues
8553

0 commit comments

Comments
 (0)