From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Dec 2008 00:16:13 +0000 (+0000)
Subject: Merged revisions 67885 via svnmerge from
X-Git-Tag: v3.1a1~673
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e43fb145908e77d9caf141584ee6520c05e7431;p=python

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

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 185fffb60d..e4727e3a65 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -45,7 +45,11 @@ from time import asctime
 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