diff options
author | Ben Darnell <ben@bendarnell.com> | 2014-01-20 11:54:51 -0500 |
---|---|---|
committer | Ben Darnell <ben@bendarnell.com> | 2014-01-20 11:54:51 -0500 |
commit | 3ed243de54759e312dddeb9f74e715d25e80f755 (patch) | |
tree | f141e7ded1552bf7c55257df3e13f498a8678d3f /sphinx/ext/autodoc.py | |
parent | 8115aa81a2972a5cc20b8d7c244c52e792ecad98 (diff) | |
download | sphinx-git-3ed243de54759e312dddeb9f74e715d25e80f755.tar.gz |
Fix an exception introduced by b69b59480cba for __init__ with no docstring.
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r-- | sphinx/ext/autodoc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 86837ff8b..77862ff2a 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -1117,8 +1117,9 @@ class ClassDocumenter(ModuleLevelDocumenter): initdocstring = self.get_attr( self.get_attr(self.object, '__init__', None), '__doc__') # for new-style classes, no __init__ means default __init__ - if (initdocstring == object.__init__.__doc__ or # for pypy - initdocstring.strip() == object.__init__.__doc__): #for !pypy + if (initdocstring is not None and + (initdocstring == object.__init__.__doc__ or # for pypy + initdocstring.strip() == object.__init__.__doc__)): #for !pypy initdocstring = None if initdocstring: if content == 'init': |