diff options
| author | Guido van Rossum <guido@python.org> | 2002-05-21 20:56:15 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-05-21 20:56:15 (GMT) |
| commit | 5e355b244ff5b76e736a949d6ee5ec4f01f0b9a0 (patch) | |
| tree | 9c173ef2af87faf3b1ded352f8619c59ef9f93b4 | |
| parent | 0a8d4d5736c8cceda74e7134a6ff446fbee1d5cc (diff) | |
| download | cpython-5e355b244ff5b76e736a949d6ee5ec4f01f0b9a0.zip cpython-5e355b244ff5b76e736a949d6ee5ec4f01f0b9a0.tar.gz cpython-5e355b244ff5b76e736a949d6ee5ec4f01f0b9a0.tar.bz2 | |
In both spilldata() functions, pretend that the docstring for
non-callable objects is always None. This makes for less confusing
output and fixes the problem reported in SF patch #550290.
| -rwxr-xr-x | Lib/pydoc.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index de6fc63..4cff5f3 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -675,7 +675,10 @@ TT { font-family: lucidatypewriter, lucida console, courier } push(msg) for name, kind, homecls, value in ok: base = self.docother(getattr(object, name), name, mod) - doc = getattr(value, "__doc__", None) + if callable(value): + doc = getattr(value, "__doc__", None) + else: + doc = None if doc is None: push('<dl><dt>%s</dl>\n' % base) else: @@ -1067,7 +1070,10 @@ class TextDoc(Doc): hr.maybe() push(msg) for name, kind, homecls, value in ok: - doc = getattr(value, "__doc__", None) + if callable(value): + doc = getattr(value, "__doc__", None) + else: + doc = None push(self.docother(getattr(object, name), name, mod, 70, doc) + '\n') return attrs |