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 pull request #3235 from lsaffre/master

Browse Source 
fix #2336 autosummary imported members
This commit is contained in:
Takayuki SHIMIZUKAWA 2016-12-14 00:45:35 +09:00 committed by GitHub
commit 60ae8437af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sphinx/ext/autosummary/generate.py
View File

@ -165,17 +165,19 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
except TemplateNotFound: except TemplateNotFound:
template = template_env.get_template('autosummary/base.rst') template = template_env.get_template('autosummary/base.rst')
def get_members(obj, typ, include_public=[]): def get_members(obj, typ, include_public=[], imported=False):
# type: (Any, unicode, List[unicode]) -> Tuple[List[unicode], List[unicode]] # type: (Any, unicode, List[unicode]) -> Tuple[List[unicode], List[unicode]]
items = [] # type: List[unicode] items = [] # type: List[unicode]
for name in dir(obj): for name in dir(obj):
try: try:
documenter = get_documenter(safe_getattr(obj, name), value = safe_getattr(obj, name)
obj)
except AttributeError: except AttributeError:
continue continue
documenter = get_documenter(value, obj)
if documenter.objtype == typ: if documenter.objtype == typ:
items.append(name) if imported or getattr(value, '__module__', None) == obj.__name__:
items.append(name)
public = [x for x in items public = [x for x in items
if x in include_public or not x.startswith('_')] if x in include_public or not x.startswith('_')]
return public, items return public, items