From ff0179740551edc8543c2acbb048386e515b2b65 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 16 Apr 2018 22:56:46 -0700 Subject: [PATCH 1/2] [2.7] fix pydoc-topics to work with Sphinx 1.7 (GH-6475) In fact, we now require a newer Sphinx version because APIs have moved around.. (cherry picked from commit acfb087f9f5590e5174a30eced3c2fe911f49d70) Co-authored-by: Benjamin Peterson --- Doc/tools/extensions/pyspecific.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index 7bbd580d203bde..da46897a9e1a51 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -15,6 +15,7 @@ from docutils import nodes, utils from docutils.parsers.rst import Directive +from sphinx.util import status_iterator from sphinx.util.nodes import split_explicit_title from sphinx.writers.html import HTMLTranslator from sphinx.writers.latex import LaTeXTranslator @@ -158,8 +159,11 @@ def run(self): class PydocTopicsBuilder(Builder): name = 'pydoc-topics' + default_translator_class = TextTranslator + def init(self): self.topics = {} + self.secnumbers = {} def get_outdated_docs(self): return 'all pydoc topics' @@ -169,9 +173,9 @@ def get_target_uri(self, docname, typ=None): def write(self, *ignored): writer = TextWriter(self) - for label in self.status_iterator(pydoc_topic_labels, - 'building topics... ', - length=len(pydoc_topic_labels)): + for label in status_iterator(pydoc_topic_labels, + 'building topics... ', + length=len(pydoc_topic_labels)): if label not in self.env.domaindata['std']['labels']: self.warn('label %r not in documentation' % label) continue From 63af2805c61057a44ae4eb13a856f6aa38c73378 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 16 Apr 2018 23:08:26 -0700 Subject: [PATCH 2/2] add missing import --- Doc/tools/extensions/pyspecific.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index da46897a9e1a51..8c45274bb27b51 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -19,6 +19,7 @@ from sphinx.util.nodes import split_explicit_title from sphinx.writers.html import HTMLTranslator from sphinx.writers.latex import LaTeXTranslator +from sphinx.writers.text import TextTranslator # monkey-patch reST parser to disable alphabetic and roman enumerated lists from docutils.parsers.rst.states import Body