IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Takayuki Shimizukawa 2014-10-09 22:05:20 +09:00
commit 4aa4d08a0a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -171,6 +171,7 @@ Bugs fixed
* PR#297, #1571: Add imgpath property to all builders. It make easier to
develop builder extensions. Thanks to Takeshi Komiya.
* #1584: Point to master doc in HTML "top" link.
* #1585: Autosummary of modules broken in Sphinx-1.2.3.
Documentation
-------------

3
sphinx/ext/autosummary/__init__.py
View File

@ -58,6 +58,7 @@ import re
import sys
import inspect
import posixpath
from types import ModuleType
from six import text_type
from docutils.parsers.rst import directives
@ -253,7 +254,7 @@ class Autosummary(Directive):
self.result = ViewList() # initialize for each documenter
full_name = real_name
if full_name.startswith(modname + '.'):
if not isinstance(obj, ModuleType):
# give explicitly separated module name, so that members
# of inner classes can be documented
full_name = modname + '::' + full_name[len(modname)+1:]