diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-08 04:01:00 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-08 04:01:00 +0000 |
| commit | 1a67f589c623316d581b45440aa03928a7814c0d (patch) | |
| tree | 68c0738209b847b1d209be9160d1cd3c251a67d2 | |
| parent | 35b345484dfb5377f8ca51e620db6b321972913b (diff) | |
| download | cpython-git-1a67f589c623316d581b45440aa03928a7814c0d.tar.gz | |
use new sphinx modules
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 12 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/suspicious.py | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index c3268e946d..018f4aca24 100644 --- 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 9a2f60128b..ae11793ea5 100644 --- 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 ::=) |