[Python-checkins] r67887 - in python/branches/py3k: Doc/tools/sphinxext/pyspecific.py
benjamin.peterson
python-checkins at python.org
Sun Dec 21 01:16:13 CET 2008
Author: benjamin.peterson
Date: Sun Dec 21 01:16:13 2008
New Revision: 67887
Log:
Merged revisions 67885 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67885 | benjamin.peterson | 2008-12-20 17:48:54 -0600 (Sat, 20 Dec 2008) | 1 line
silence annoying DeprecationWarning
........
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 Sun Dec 21 01:16:13 2008
@@ -45,7 +45,11 @@
from pprint import pformat
from docutils.io import StringOutput
from docutils.utils import new_document
-from sphinx.builder import Builder
+
+try:
+ from sphinx.builders import Builder
+except ImportError:
+ from sphinx.builder import Builder
try:
from sphinx.writers.text import TextWriter
More information about the Python-checkins
mailing list