Fix docs, blurb release, pydoc-topics for 3.5.8rc2.

python · Oct 12, 2019 · 280a0f5 · 280a0f5
1 parent c386c8b
commit 280a0f5
Show file tree

Hide file tree

Showing 5 changed files with 1,122 additions and 881 deletions.
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
@@ -24,7 +24,7 @@
 from sphinx.builders import Builder
 from sphinx.util.nodes import split_explicit_title
 from sphinx.writers.html import HTMLTranslator
-from sphinx.writers.text import TextWriter
+from sphinx.writers.text import TextWriter, TextTranslator
 from sphinx.writers.latex import LaTeXTranslator
 from sphinx.domains.python import PyModulelevel, PyClassmember
 
@@ -286,8 +286,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'
@@ -296,8 +299,12 @@ def get_target_uri(self, docname, typ=None):
         return ''  # no URIs
 
     def write(self, *ignored):
+        try:  # sphinx>=1.6
+            from sphinx.util import status_iterator
+        except ImportError:  # sphinx<1.6
+            status_iterator = self.status_iterator
         writer = TextWriter(self)
-        for label in self.status_iterator(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']: