[Python-checkins] r68984 - in python/branches/release26-maint/Doc/tools/sphinxext: pyspecific.py suspicious.py

[georg.brandl]

Author: georg.brandl
Date: Tue Jan 27 00:06:17 2009
New Revision: 68984

Log:
Allow docs to be built with Sphinx 0.5.x.


Modified:
   python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py
   python/branches/release26-maint/Doc/tools/sphinxext/suspicious.py

Modified: python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py
==============================================================================
--- python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py	(original)
+++ python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py	Tue Jan 27 00:06:17 2009
@@ -48,8 +48,15 @@
 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):

Modified: python/branches/release26-maint/Doc/tools/sphinxext/suspicious.py
==============================================================================
--- python/branches/release26-maint/Doc/tools/sphinxext/suspicious.py	(original)
+++ python/branches/release26-maint/Doc/tools/sphinxext/suspicious.py	Tue Jan 27 00:06:17 2009
@@ -45,7 +45,12 @@
 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 ::=)