diff options
author | Georg Brandl <georg@python.org> | 2010-01-17 17:43:33 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-01-17 17:43:33 +0100 |
commit | b0e2c44dc86e01b31d979db3fb02098c1fb77e96 (patch) | |
tree | deeed3a8cf5a8c36e44522669e61970cb44bcd69 /sphinx/ext/autodoc.py | |
parent | 344dab342fc1b41efb87254df7c755c70aafd095 (diff) | |
parent | c5d67b03219f3643ea9e250a7cd3cafd5aaf2efb (diff) | |
download | sphinx-git-b0e2c44dc86e01b31d979db3fb02098c1fb77e96.tar.gz |
merge with trunk
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r-- | sphinx/ext/autodoc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 53625dde8..720aee384 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -20,9 +20,10 @@ from docutils import nodes from docutils.utils import assemble_option_dict from docutils.statemachine import ViewList -from sphinx.util import rpartition, nested_parse_with_titles, force_decode +from sphinx.util import rpartition, force_decode from sphinx.pycode import ModuleAnalyzer, PycodeError from sphinx.application import ExtensionError +from sphinx.util.nodes import nested_parse_with_titles from sphinx.util.compat import Directive from sphinx.util.inspect import isdescriptor, safe_getmembers, safe_getattr from sphinx.util.docstrings import prepare_docstring |