summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-22 11:16:48 +0200
committerGeorg Brandl <georg@python.org>2010-10-22 11:16:48 +0200
commitdb8189083d6022a34b331d4c482776ba301eae1b (patch)
tree4772befc0e005a3cd7f7377d6c5777a8f24ec43b /sphinx/ext/autodoc.py
parent92f6212c98871ddba777524039d8b1950a069c53 (diff)
parent357f8472c7f8b7772d27c561215bc8f981f13001 (diff)
downloadsphinx-git-db8189083d6022a34b331d4c482776ba301eae1b.tar.gz
merge with 1.0
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r--sphinx/ext/autodoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 3a2476a6b..696e5f1d0 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -664,7 +664,7 @@ class Documenter(object):
# parse right now, to get PycodeErrors on parsing (results will
# be cached anyway)
self.analyzer.find_attr_docs()
- except PycodeError, err:
+ except PycodeError:
# no source file -- e.g. for builtin and C modules
self.analyzer = None
# at least add the module.__file__ as a dependency