Merged revisions 67467 via svnmerge from

birkenfeld · birkenfeld · commit db6f108532ce · 2008-12-01T23:02:51.000Z
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
@@ -46,7 +46,11 @@ def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
 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'
