From: Georg Brandl <georg@python.org>
Date: Tue, 2 Dec 2008 08:25:00 +0000 (+0000)
Subject: Merged revisions 67467 via svnmerge from
X-Git-Tag: v2.6.1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23f7490835a8d2255fb9e0919599f7e70da19cc3;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 22ecaa23a366..00190f2a9542 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'