diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-06-21 17:05:31 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-06-21 17:05:31 +0900 |
| commit | ff8ce91f77d692c90f80be90acb541d8771dcf9e (patch) | |
| tree | f9f03ca5c2299a9220ecd5c5a61d9570fb5ba1c3 /sphinx/ext/autosummary/generate.py | |
| parent | 1d742bdcf5181c0b8b4a3be310d28179d3d14819 (diff) | |
| download | sphinx-git-ff8ce91f77d692c90f80be90acb541d8771dcf9e.tar.gz | |
* Fix: autosummary can't handle nested classes correctly. Closes #1441
Diffstat (limited to 'sphinx/ext/autosummary/generate.py')
| -rw-r--r-- | sphinx/ext/autosummary/generate.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py index c4f150a0e..20e7fc916 100644 --- a/sphinx/ext/autosummary/generate.py +++ b/sphinx/ext/autosummary/generate.py @@ -126,7 +126,7 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst', ensuredir(path) try: - name, obj, parent = import_by_name(name) + name, obj, parent, mod_name = import_by_name(name) except ImportError, e: warn('[autosummary] failed to import %r: %s' % (name, e)) continue @@ -235,7 +235,7 @@ def find_autosummary_in_docstring(name, module=None, filename=None): See `find_autosummary_in_lines`. """ try: - real_name, obj, parent = import_by_name(name) + real_name, obj, parent, modname = import_by_name(name) lines = pydoc.getdoc(obj).splitlines() return find_autosummary_in_lines(lines, module=name, filename=filename) except AttributeError: |