summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorJulien Palard <julien@palard.fr>2019-09-12 11:23:53 (GMT)
committerGregory P. Smith <greg@krypto.org>2019-09-12 11:23:53 (GMT)
commit2c910c1e732c9a3ec4c67a7c43d789d6c729304a (patch)
tree43849add2eb640fb407a83fbeb672b05044e9dfb /Doc
parent894d0f7d5542ee04556ec1bee8c58506f7c916d4 (diff)
downloadcpython-2c910c1e732c9a3ec4c67a7c43d789d6c729304a.zip
cpython-2c910c1e732c9a3ec4c67a7c43d789d6c729304a.tar.gz
cpython-2c910c1e732c9a3ec4c67a7c43d789d6c729304a.tar.bz2
bpo-36675: Remove obsolete code. (GH-16024)
Does no longer work since Sphinx moved the trim_doctest_flag option in the configuration.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/doctest.rst2
-rw-r--r--Doc/tools/extensions/pyspecific.py32
2 files changed, 0 insertions, 34 deletions
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index e7c0033..7fc471f 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1,5 +1,3 @@
-:keepdoctest:
-
:mod:`doctest` --- Test interactive Python examples
===================================================
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index 4e2ad7f..bc51555 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -29,7 +29,6 @@ except ImportError:
from sphinx.locale import translators
from sphinx.util import status_iterator, logging
from sphinx.util.nodes import split_explicit_title
-from sphinx.writers.html import HTMLTranslator
from sphinx.writers.text import TextWriter, TextTranslator
from sphinx.writers.latex import LaTeXTranslator
from sphinx.domains.python import PyModulelevel, PyClassmember
@@ -49,37 +48,6 @@ Body.enum.converters['loweralpha'] = \
Body.enum.converters['lowerroman'] = \
Body.enum.converters['upperroman'] = lambda x: None
-# monkey-patch HTML and LaTeX translators to keep doctest blocks in the
-# doctest docs themselves
-orig_visit_literal_block = HTMLTranslator.visit_literal_block
-orig_depart_literal_block = LaTeXTranslator.depart_literal_block
-
-
-def new_visit_literal_block(self, node):
- meta = self.builder.env.metadata[self.builder.current_docname]
- old_trim_doctest_flags = self.highlighter.trim_doctest_flags
- if 'keepdoctest' in meta:
- self.highlighter.trim_doctest_flags = False
- try:
- orig_visit_literal_block(self, node)
- finally:
- self.highlighter.trim_doctest_flags = old_trim_doctest_flags
-
-
-def new_depart_literal_block(self, node):
- meta = self.builder.env.metadata[self.curfilestack[-1]]
- old_trim_doctest_flags = self.highlighter.trim_doctest_flags
- if 'keepdoctest' in meta:
- self.highlighter.trim_doctest_flags = False
- try:
- orig_depart_literal_block(self, node)
- finally:
- self.highlighter.trim_doctest_flags = old_trim_doctest_flags
-
-
-HTMLTranslator.visit_literal_block = new_visit_literal_block
-LaTeXTranslator.depart_literal_block = new_depart_literal_block
-
# Support for marking up and linking to bugs.python.org issues