diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-01-22 18:34:51 +0400 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2014-01-22 18:34:51 +0400 |
| commit | fbc580716c7f453291eb1d9dcf22e6586e828837 (patch) | |
| tree | 26bce4c2ef75b4ebe8422685d8962aa07978bad2 /sphinx/ext | |
| parent | 9cd3b4aea7a5d7e6cf776646faba12b4cfa1c2a9 (diff) | |
| parent | 930d996dbe5bcccbb0d86de5940376b70ed7c3db (diff) | |
| download | sphinx-fbc580716c7f453291eb1d9dcf22e6586e828837.tar.gz | |
Merge
Diffstat (limited to 'sphinx/ext')
| -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 69c7753b..533993c5 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': |