Skip to content

Commit 280a0f5

Browse files
committed
Fix docs, blurb release, pydoc-topics for 3.5.8rc2.
1 parent c386c8b commit 280a0f5

File tree

5 files changed

+1122
-881
lines changed

5 files changed

+1122
-881
lines changed

Doc/tools/extensions/pyspecific.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from sphinx.builders import Builder
2525
from sphinx.util.nodes import split_explicit_title
2626
from sphinx.writers.html import HTMLTranslator
27-
from sphinx.writers.text import TextWriter
27+
from sphinx.writers.text import TextWriter, TextTranslator
2828
from sphinx.writers.latex import LaTeXTranslator
2929
from sphinx.domains.python import PyModulelevel, PyClassmember
3030

@@ -286,8 +286,11 @@ def run(self):
286286
class PydocTopicsBuilder(Builder):
287287
name = 'pydoc-topics'
288288

289+
default_translator_class = TextTranslator
290+
289291
def init(self):
290292
self.topics = {}
293+
self.secnumbers = {}
291294

292295
def get_outdated_docs(self):
293296
return 'all pydoc topics'
@@ -296,8 +299,12 @@ def get_target_uri(self, docname, typ=None):
296299
return '' # no URIs
297300

298301
def write(self, *ignored):
302+
try: # sphinx>=1.6
303+
from sphinx.util import status_iterator
304+
except ImportError: # sphinx<1.6
305+
status_iterator = self.status_iterator
299306
writer = TextWriter(self)
300-
for label in self.status_iterator(pydoc_topic_labels,
307+
for label in status_iterator(pydoc_topic_labels,
301308
'building topics... ',
302309
length=len(pydoc_topic_labels)):
303310
if label not in self.env.domaindata['std']['labels']:

0 commit comments

Comments
 (0)