Skip to content

Commit

Permalink
bpo-36675: Remove obsolete code. (pythonGH-16024)
Browse files Browse the repository at this point in the history
Does no longer work since Sphinx moved the trim_doctest_flag option in
the configuration.
  • Loading branch information
JulienPalard authored and gpshead committed Sep 12, 2019
1 parent 894d0f7 commit 2c910c1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 34 deletions.
2 changes: 0 additions & 2 deletions Doc/library/doctest.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
:keepdoctest:

:mod:`doctest` --- Test interactive Python examples
===================================================

Expand Down
32 changes: 0 additions & 32 deletions Doc/tools/extensions/pyspecific.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
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
Expand All @@ -49,37 +48,6 @@
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

Expand Down

0 comments on commit 2c910c1

Please sign in to comment.