diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-02-03 22:27:20 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-02-03 22:27:20 +0900 |
| commit | 70f3f889d10add356438137ac0d4f593ff6406a6 (patch) | |
| tree | 50ad81569ff52bb83cbe4d4a63a2a2a48284b6c8 /sphinx/ext/autodoc.py | |
| parent | e70a43a9c53759d4b4b8f5109a02fe0e793835ff (diff) | |
| download | sphinx-git-70f3f889d10add356438137ac0d4f593ff6406a6.tar.gz | |
Fix autodoc crash if :members: and :special-members: ware both set (by d7ac5e4).
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 89680981c..555a31066 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -592,6 +592,7 @@ class Documenter(object): membername != '__doc__': keep = has_doc or self.options.undoc_members elif self.options.special_members and \ + self.options.special_members is not ALL and \ membername in self.options.special_members: keep = has_doc or self.options.undoc_members elif want_all and membername.startswith('_'): |