diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-16 11:45:57 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-16 11:45:57 +0900 |
| commit | 4b5eebdc877759e204aa90435aebcf313a44f6cd (patch) | |
| tree | c240b4ca43ffefc88dda6d3a18ca2a61303aacb4 /sphinx/ext/autodoc.py | |
| parent | e5786b888cfce77772f2e11d9f2934b941edbc7d (diff) | |
| parent | 4583c4b0227e425bca7b3c26b80d904a13a9c714 (diff) | |
| download | sphinx-git-4b5eebdc877759e204aa90435aebcf313a44f6cd.tar.gz | |
Merge branch 'stable' into 1.5-release
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 20f4cee0b..59e585678 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -141,6 +141,7 @@ def members_set_option(arg): return ALL return set(x.strip() for x in arg.split(',')) + SUPPRESS = object() |