use new sphinx modules

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index c3268e946d1e441ba0361fe0231aff37058b6445..018f4aca2435c0f579338ea2a636b8cd9d6fad40 100644 (file)
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -48,15 +48,9 @@ from pprint import pformat
 from docutils.io import StringOutput
 from docutils.utils import new_document
 
-try:
-    from sphinx.builders import Builder
-except ImportError:
-    from sphinx.builder import Builder
-
-try:
-    from sphinx.writers.text import TextWriter
-except ImportError:
-    from sphinx.textwriter import TextWriter
+from sphinx.builders import Builder
+from sphinx.writers.text import TextWriter
+
 
 class PydocTopicsBuilder(Builder):
     name = 'pydoc-topics'

diff --git a/Doc/tools/sphinxext/suspicious.py b/Doc/tools/sphinxext/suspicious.py
index 9a2f60128bb3560280e263db6cfa93aae0a8d1bd..ae11793ea54830b805dead5dabb8d1fc03fe35d9 100644 (file)
--- a/Doc/tools/sphinxext/suspicious.py
+++ b/Doc/tools/sphinxext/suspicious.py
@@ -45,7 +45,7 @@ import os, sys
 import csv
 import re
 from docutils import nodes
-from sphinx.builder import Builder
+from sphinx.builders import Builder
 
 detect_all = re.compile(ur'''
     ::(?=[^=])|            # two :: (but NOT ::=)