diff options
| author | Georg Brandl <georg@python.org> | 2009-04-28 21:23:39 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-04-28 21:23:39 +0200 |
| commit | dbf9f9985fda7471ea5d928c858dcb5a313e3f60 (patch) | |
| tree | 73a67d7872af234ddc14fa5a505f43afd3700b21 /sphinx/ext/autodoc.py | |
| parent | 97ebfba6c89a54f6e98476582e375b0ca618f4e8 (diff) | |
| parent | 75cccedad15dd7e0abe8db1e33a864322eabf14e (diff) | |
| download | sphinx-git-dbf9f9985fda7471ea5d928c858dcb5a313e3f60.tar.gz | |
merge with 0.6
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index caf34345a..85b89149b 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -484,7 +484,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): |