diff --git a/CHANGES b/CHANGES index 89bc6c8aeb..b2c6fa2b89 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ Features added Bugs fixed ---------- +* Now sphinx.ext.autodoc work with python-2.5 again. * #1563: :meth:`~sphinx.application.Sphinx.add_search_language` raises AssertionError for correct type of argument. Thanks to rikoman. * #1568: fix a crash when a "centered" directive contains a reference. diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 423f921a24..b4ecf32fd9 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -347,7 +347,7 @@ class Documenter(object): return True # this used to only catch SyntaxError, ImportError and AttributeError, # but importing modules with side effects can raise all kinds of errors - except (Exception, SystemExit) as e: + except (Exception, SystemExit), e: if self.objpath: errmsg = 'autodoc: failed to import %s %r from module %r' % \ (self.objtype, '.'.join(self.objpath), self.modname)