use new sphinx modules

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
+
 
 class PydocTopicsBuilder(Builder):
     name = 'pydoc-topics'

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 ::=)