summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-11-09 00:37:42 +0100
committerGeorg Brandl <georg@python.org>2009-11-09 00:37:42 +0100
commit407b41536dc555cc0538f00992a9a76ff7eefb5c (patch)
tree951fb4b9bffc7b2479eb467b885f6ccacd80be05 /sphinx/ext/autodoc.py
parentae0c16a3d3de66325d0e4b826c8988142986fb9e (diff)
parent4f03d86b4abcbf053df5227e4798f3072ed57915 (diff)
downloadsphinx-git-407b41536dc555cc0538f00992a9a76ff7eefb5c.tar.gz
merge with trunk
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 1800861ea..70d03f59f 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' %