Author: benjamin.peterson Date: Sun Nov 30 23:01:37 2008 New Revision: 67459 Log: 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 ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py Modified: python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py ============================================================================== --- python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py (original) +++ python/branches/release26-maint/Doc/tools/sphinxext/pyspecific.py Sun Nov 30 23:01:37 2008 @@ -48,7 +48,7 @@ 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'