From 5e355b244ff5b76e736a949d6ee5ec4f01f0b9a0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 21 May 2002 20:56:15 +0000 Subject: [PATCH] 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. --- Lib/pydoc.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index de6fc63835c..4cff5f3a37a 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -675,7 +675,10 @@ def spilldata(msg, attrs, predicate): 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('
%s
\n' % base) else: @@ -1067,7 +1070,10 @@ def spilldata(msg, attrs, predicate): 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