diff options
| author | Georg Brandl <georg@python.org> | 2008-12-07 22:36:44 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-12-07 22:36:44 +0100 |
| commit | 711124728b37ab277373b02ad374c14572eb981e (patch) | |
| tree | c9b76bb934779054d7a524668bd8cc7c521798fc /sphinx/ext | |
| parent | 25c6f7d4e06b73e69d784780ef9918ef3d526238 (diff) | |
| parent | e0251d3d4c9b7ee931dae66c48552b27f5c1719d (diff) | |
| download | sphinx-711124728b37ab277373b02ad374c14572eb981e.tar.gz | |
Automated merge with file:///home/gbr/devel/sphinx0.5
Diffstat (limited to 'sphinx/ext')
| -rw-r--r-- | sphinx/ext/coverage.py | 2 | ||||
| -rw-r--r-- | sphinx/ext/doctest.py | 2 | ||||
| -rw-r--r-- | sphinx/ext/intersphinx.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/ext/coverage.py b/sphinx/ext/coverage.py index f03dbc1e..dfe01419 100644 --- a/sphinx/ext/coverage.py +++ b/sphinx/ext/coverage.py @@ -16,7 +16,7 @@ import inspect import cPickle as pickle from os import path -from sphinx.builder import Builder +from sphinx.builders import Builder # utility diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py index badd50ff..aa38bc71 100644 --- a/sphinx/ext/doctest.py +++ b/sphinx/ext/doctest.py @@ -21,7 +21,7 @@ doctest = __import__('doctest') from docutils import nodes from docutils.parsers.rst import directives -from sphinx.builder import Builder +from sphinx.builders import Builder from sphinx.util.console import bold blankline_re = re.compile(r'^\s*<BLANKLINE>', re.MULTILINE) diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index 0c034e0d..85733ac4 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -31,7 +31,7 @@ from os import path from docutils import nodes -from sphinx.builder import INVENTORY_FILENAME +from sphinx.builders.html import INVENTORY_FILENAME def fetch_inventory(app, uri, inv): |