summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-09-27 04:08:16 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-09-27 04:08:16 (GMT)
commit8ac8be59885f27a1afbcc978be0dc0ceea554aa4 (patch)
tree51b3a190fe3609a525d3f9fd1d07a090669fbd4a /Lib
parent351e362d8975555ca2859becdc95c4943e24ebc9 (diff)
downloadcpython-8ac8be59885f27a1afbcc978be0dc0ceea554aa4.zip
cpython-8ac8be59885f27a1afbcc978be0dc0ceea554aa4.tar.gz
cpython-8ac8be59885f27a1afbcc978be0dc0ceea554aa4.tar.bz2
docroutine() (both instances): Docstrings for class methods weren't
getting displayed, due to a special case here whose purpose I didn't understand. So just disabled the doc suppression here. Another special case here skips the docs when picking apart a method and finding that the im_func is also in the class __dict__ under the same name. That one I understood. It has a curious consequence, though, wrt inherited properties: a static class copies inherited stuff into the inheriting class's dict, and that affects whether or not this special case triggers. The upshoot is that pydoc doesn't show the function docstrings of getter/setter/deleter functions of inherited properties in the property section when the class is static, but does when the class is dynamic (bring up Lib/test/pydocfodder.py under GUI pydoc to see this).
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/pydoc.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index e5c350b..1e33339 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -759,7 +759,6 @@ TT { font-family: lucidatypewriter, lucida console, courier }
if cl:
if imclass is not cl:
note = ' from ' + self.classlink(imclass, mod)
- skipdocs = 1
else:
if object.im_self:
note = ' method of %s instance' % self.classlink(
@@ -1117,7 +1116,6 @@ class TextDoc(Doc):
if cl:
if imclass is not cl:
note = ' from ' + classname(imclass, mod)
- skipdocs = 1
else:
if object.im_self:
note = ' method of %s instance' % classname(