diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-01-15 05:25:56 +0000 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-01-15 05:25:56 +0000 |
| commit | cc7509966c50b8a0dda55a51fb22ce4e6605ef1f (patch) | |
| tree | b436c36a949d036d656363ad0e24b91ca8a39a4d /sphinx/ext/autodoc.py | |
| parent | 295fdf46f87399f0f851da51fafcf56a87804c3a (diff) | |
| parent | f7cb510ebd558f16cc3ac6102c0c4a6280ee06ed (diff) | |
| download | sphinx-git-cc7509966c50b8a0dda55a51fb22ce4e6605ef1f.tar.gz | |
merge heads
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index c454641bf..571f36cbe 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -29,7 +29,7 @@ from sphinx.util.nodes import nested_parse_with_titles from sphinx.util.compat import Directive from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \ safe_getattr, safe_repr, is_builtin_class_method -from sphinx.util.pycompat import base_exception, class_types +from sphinx.util.pycompat import class_types from sphinx.util.docstrings import prepare_docstring @@ -1130,7 +1130,7 @@ class ExceptionDocumenter(ClassDocumenter): @classmethod def can_document_member(cls, member, membername, isattr, parent): return isinstance(member, class_types) and \ - issubclass(member, base_exception) + issubclass(member, BaseException) class DataDocumenter(ModuleLevelDocumenter): |