[Python-checkins] r68393 - in python/trunk/Doc/tools/sphinxext: pyspecific.py suspicious.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jan  8 05:01:00 2009
New Revision: 68393

Log:
use new sphinx modules

Modified:
   python/trunk/Doc/tools/sphinxext/pyspecific.py
   python/trunk/Doc/tools/sphinxext/suspicious.py

Modified: python/trunk/Doc/tools/sphinxext/pyspecific.py
==============================================================================
--- python/trunk/Doc/tools/sphinxext/pyspecific.py	(original)
+++ python/trunk/Doc/tools/sphinxext/pyspecific.py	Thu Jan  8 05:01:00 2009
@@ -48,15 +48,9 @@
 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'

Modified: python/trunk/Doc/tools/sphinxext/suspicious.py
==============================================================================
--- python/trunk/Doc/tools/sphinxext/suspicious.py	(original)
+++ python/trunk/Doc/tools/sphinxext/suspicious.py	Thu Jan  8 05:01:00 2009
@@ -45,7 +45,7 @@
 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 ::=)