summaryrefslogtreecommitdiffstats
path: root/Doc/tools
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-12-02 08:25:00 (GMT)
committerGeorg Brandl <georg@python.org>2008-12-02 08:25:00 (GMT)
commit23f7490835a8d2255fb9e0919599f7e70da19cc3 (patch)
treea8bc7d54542c3a8d22bf48e3cbb1a3a306b9a143 /Doc/tools
parent1d8592b75b36016aa0d17402fcf5951f30a3114c (diff)
downloadcpython-23f7490835a8d2255fb9e0919599f7e70da19cc3.zip
cpython-23f7490835a8d2255fb9e0919599f7e70da19cc3.tar.gz
cpython-23f7490835a8d2255fb9e0919599f7e70da19cc3.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')
-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 22ecaa2..00190f2 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -48,7 +48,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'