From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Nov 2008 22:01:37 +0000 (+0000)
Subject: Merged revisions 67458 via svnmerge from
X-Git-Tag: v2.6.1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e444f089f8a1a60c00072d2d57c45d16d4c4813;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67458 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67458 | benjamin.peterson | 2008-11-30 15:46:16 -0600 (Sun, 30 Nov 2008) | 1 line

  fix pyspecific extensions that were broken by Sphinx's grand renaming
........
---

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 9a8b897689b3..22ecaa23a366 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -48,7 +48,7 @@ from pprint import pformat
 from docutils.io import StringOutput
 from docutils.utils import new_document
 from sphinx.builder import Builder
-from sphinx.textwriter import TextWriter
+from sphinx.writers.text import TextWriter
 
 class PydocTopicsBuilder(Builder):
     name = 'pydoc-topics'