commit 6e43fb145908e77d9caf141584ee6520c05e7431
author Benjamin Peterson <benjamin@python.org> Sun Dec 21 00:16:13 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Sun Dec 21 00:16:13 2008 +0000
tree 19deecb8d93d0dad9b2027ea40b3bf2e09dcf940
parent 6ebe78f5ccf7a58e64b42e74f7977c49d1c8f08b

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
........

Doc/tools/sphinxext/pyspecific.py

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 185fffb..e4727e3 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -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