summaryrefslogtreecommitdiffstats
path: root/Doc/tools/sphinxext
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-12-01 23:02:51 (GMT)
committerGeorg Brandl <georg@python.org>2008-12-01 23:02:51 (GMT)
commitdb6f108532cecbe1984279c210a44cc06fc0b493 (patch)
treeff08d03c83dcf2c0bf1517ce77a41da7b74e6dc4 /Doc/tools/sphinxext
parent6825e17e1e4bc0034b6aba665d5e641e3febecfa (diff)
downloadcpython-db6f108532cecbe1984279c210a44cc06fc0b493.zip
cpython-db6f108532cecbe1984279c210a44cc06fc0b493.tar.gz
cpython-db6f108532cecbe1984279c210a44cc06fc0b493.tar.bz2
Merged revisions 67467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67467 | benjamin.peterson | 2008-12-01 13:52:51 +0100 (Mon, 01 Dec 2008) | 1 line let people using SVN Sphinx still build the docs ........
Diffstat (limited to 'Doc/tools/sphinxext')
-rw-r--r--Doc/tools/sphinxext/pyspecific.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 9ff9a7a..185fffb 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -46,7 +46,11 @@ from pprint import pformat
from docutils.io import StringOutput
from docutils.utils import new_document
from sphinx.builder import Builder
-from sphinx.writers.text import TextWriter
+
+try:
+ from sphinx.writers.text import TextWriter
+except ImportError:
+ from sphinx.textwriter import TextWriter
class PydocTopicsBuilder(Builder):
name = 'pydoc-topics'