Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.62
diff -c -r1.62 pydoc.py
*** pydoc.py	7 Apr 2002 06:36:23 -0000	1.62
--- pydoc.py	21 May 2002 18:55:10 -0000
***************
*** 675,681 ****
                  push(msg)
                  for name, kind, homecls, value in ok:
                      base = self.docother(getattr(object, name), name, mod)
!                     doc = getattr(value, "__doc__", None)
                      if doc is None:
                          push('<dl><dt>%s</dl>\n' % base)
                      else:
--- 675,684 ----
                  push(msg)
                  for name, kind, homecls, value in ok:
                      base = self.docother(getattr(object, name), name, mod)
!                     if callable(value):
!                         doc = getattr(value, "__doc__", None)
!                     else:
!                         doc = None
                      if doc is None:
                          push('<dl><dt>%s</dl>\n' % base)
                      else:
***************
*** 1067,1073 ****
                  hr.maybe()
                  push(msg)
                  for name, kind, homecls, value in ok:
!                     doc = getattr(value, "__doc__", None)
                      push(self.docother(getattr(object, name),
                                         name, mod, 70, doc) + '\n')
              return attrs
--- 1070,1079 ----
                  hr.maybe()
                  push(msg)
                  for name, kind, homecls, value in ok:
!                     if callable(value):
!                         doc = getattr(value, "__doc__", None)
!                     else:
!                         doc = None
                      push(self.docother(getattr(object, name),
                                         name, mod, 70, doc) + '\n')
              return attrs