IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Takayuki Shimizukawa
2014-01-15 04:59:51 +00:00
parent dbd544d12b 5721370438
commit 295fdf46f8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sphinx/ext/autodoc.py
View File

@@ -1085,7 +1085,8 @@ class ClassDocumenter(ModuleLevelDocumenter):
initdocstring = self.get_attr( initdocstring = self.get_attr(
self.get_attr(self.object, '__init__', None), '__doc__') self.get_attr(self.object, '__init__', None), '__doc__')
# for new-style classes, no __init__ means default __init__ # for new-style classes, no __init__ means default __init__
if initdocstring.strip() == object.__init__.__doc__.strip(): if (initdocstring == object.__init__.__doc__ or # for pypy
initdocstring.strip() == object.__init__.__doc__): #for !pypy
initdocstring = None initdocstring = None
if initdocstring: if initdocstring:
if content == 'init': if content == 'init':