]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Allow docs to be built with Sphinx 0.5.x.
authorGeorg Brandl <georg@python.org>
Mon, 26 Jan 2009 23:06:17 +0000 (23:06 +0000)
committerGeorg Brandl <georg@python.org>
Mon, 26 Jan 2009 23:06:17 +0000 (23:06 +0000)
Doc/tools/sphinxext/pyspecific.py
Doc/tools/sphinxext/suspicious.py

index 018f4aca2435c0f579338ea2a636b8cd9d6fad40..48ce6dacb64053e111afdba29dc9cc2240d09559 100644 (file)
@@ -48,8 +48,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):
index ae11793ea54830b805dead5dabb8d1fc03fe35d9..245a759bed921fe4d59a23129a77d635e1c722b4 100644 (file)
@@ -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 ::=)