merge with stable

This commit is contained in:
Takayuki Shimizukawa
2014-01-15 04:59:51 +00:00

View File

@@ -1085,7 +1085,8 @@ 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.strip() == object.__init__.__doc__.strip():
if (initdocstring == object.__init__.__doc__ or # for pypy
initdocstring.strip() == object.__init__.__doc__): #for !pypy
initdocstring = None
if initdocstring:
if content == 'init':