Merged in frasertweedale/sphinx (pull request #37)

This commit is contained in:
Georg Brandl 2012-01-29 10:06:49 +01:00
commit 3f2c019ea7

View File

@ -20,12 +20,15 @@ import optparse
from os import path
# automodule options
OPTIONS = [
'members',
'undoc-members',
# 'inherited-members', # disabled because there's a bug in sphinx
'show-inheritance',
]
if 'SPHINX_APIDOC_OPTIONS' in os.environ:
OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
else:
OPTIONS = [
'members',
'undoc-members',
# 'inherited-members', # disabled because there's a bug in sphinx
'show-inheritance',
]
INITPY = '__init__.py'