Taken from the 2.6 branch:

r68984 | georg.brandl | 2009-01-27 00:06:17 +0100 (Di, 27. Jan 2009) | 2 lines

Allow docs to be built with Sphinx 0.5.x.

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index be0da34683aed4d82abecb8d9f4195fe342c86c4..860b15399e9cafdfcd6c0c82a555aac9cacfb1bb 100644 (file)
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -54,8 +54,15 @@ from pprint import pformat
 from docutils.io import StringOutput
 from docutils.utils import new_document
 
-from sphinx.builders import Builder
-from sphinx.writers.text import TextWriter
+try:
+    from sphinx.builders import Builder
+except ImportError:
+    from sphinx.builder import Builder
+
+try:
+    from sphinx.writers.text import TextWriter
+except ImportError:
+    from sphinx.textwriter import TextWriter
 
 
 class PydocTopicsBuilder(Builder):

diff --git a/Doc/tools/sphinxext/suspicious.py b/Doc/tools/sphinxext/suspicious.py
index ae11793ea54830b805dead5dabb8d1fc03fe35d9..245a759bed921fe4d59a23129a77d635e1c722b4 100644 (file)
--- a/Doc/tools/sphinxext/suspicious.py
+++ b/Doc/tools/sphinxext/suspicious.py
@@ -45,7 +45,12 @@ import os, sys
 import csv
 import re
 from docutils import nodes
-from sphinx.builders import Builder
+
+try:
+    from sphinx.builders import Builder
+except ImportError:
+    from sphinx.builder import Builder
+
 
 detect_all = re.compile(ur'''
     ::(?=[^=])|            # two :: (but NOT ::=)