summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-28 20:08:17 +0200
committerGeorg Brandl <georg@python.org>2009-04-28 20:08:17 +0200
commit124864ed2772b59b130ee48fb6dc65953f8157f2 (patch)
treea4cdff3403286cb36cb66ed08233c2eec5ff121a /sphinx/ext/autodoc.py
parent46bc1cbe4b969ed88f23207a3612861218370a48 (diff)
downloadsphinx-git-124864ed2772b59b130ee48fb6dc65953f8157f2.tar.gz
#145: Fix autodoc problem with automatic members that refuse to be
getattr()'d from their parent.
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 53f533979..110314242 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -485,7 +485,7 @@ class Documenter(object):
# using keys() because apparently there are objects for which
# __dict__ changes while getting attributes
return False, sorted([
- (mname, self.get_attr(self.object, mname))
+ (mname, self.get_attr(self.object, mname, None))
for mname in self.get_attr(self.object, '__dict__').keys()])
def filter_members(self, members, want_all):