[Python-3000-checkins] r67468 - in python/branches/py3k: Doc/tools/sphinxext/pyspecific.py

[georg.brandl]

Author: georg.brandl
Date: Tue Dec 2 00:02:51 2008
New Revision: 67468

Log:
Merged revisions 67467 via svnmerge from
svn+ssh://pythondev at 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
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/tools/sphinxext/pyspecific.py

Modified: python/branches/py3k/Doc/tools/sphinxext/pyspecific.py
==============================================================================
--- python/branches/py3k/Doc/tools/sphinxext/pyspecific.py (original)
+++ python/branches/py3k/Doc/tools/sphinxext/pyspecific.py Tue Dec 2 00:02:51 2008
@@ -46,7 +46,11 @@
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'