summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-11-09 00:33:49 +0100
committerGeorg Brandl <georg@python.org>2009-11-09 00:33:49 +0100
commit559067595599b4eee7f8cb4b9da6208fe000e098 (patch)
tree5c9ea635630ea691dd0a53846316e1d521bd4d63 /sphinx/ext/autodoc.py
parent51a1698dc6505b477bb0f8da90324810caa2d677 (diff)
parentb9253e348b4f5e8047a38092ce99f5891496b8eb (diff)
downloadsphinx-git-559067595599b4eee7f8cb4b9da6208fe000e098.tar.gz
merge with 0.6
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r--sphinx/ext/autodoc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index ef09b61a1..b5c59ec53 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -322,7 +322,9 @@ class Documenter(object):
obj = self.get_attr(obj, part)
self.object = obj
return True
- except (SyntaxError, ImportError, AttributeError), err:
+ # this used to only catch SyntaxError, ImportError and AttributeError,
+ # but importing modules with side effects can raise all kinds of errors
+ except Exception, err:
self.directive.warn(
'autodoc can\'t import/find %s %r, it reported error: '
'"%s", please check your spelling and sys.path' %