*** pydoc.py	2005-02-19 17:57:37.000000000 -0500
--- /halloween/data1/debug/lib/python2.4/pydoc.py	2005-05-03 09:04:17.000000000 -0400
***************
*** 831,837 ****
                  if imclass is not cl:
                      note = ' from ' + self.classlink(imclass, mod)
              else:
!                 if object.im_self:
                      note = ' method of %s instance' % self.classlink(
                          object.im_self.__class__, mod)
                  else:
--- 831,837 ----
                  if imclass is not cl:
                      note = ' from ' + self.classlink(imclass, mod)
              else:
!                 if object.im_self is not None:
                      note = ' method of %s instance' % self.classlink(
                          object.im_self.__class__, mod)
                  else:
***************
*** 1223,1229 ****
                  if imclass is not cl:
                      note = ' from ' + classname(imclass, mod)
              else:
!                 if object.im_self:
                      note = ' method of %s instance' % classname(
                          object.im_self.__class__, mod)
                  else:
--- 1223,1229 ----
                  if imclass is not cl:
                      note = ' from ' + classname(imclass, mod)
              else:
!                 if object.im_self is not None:
                      note = ' method of %s instance' % classname(
                          object.im_self.__class__, mod)
                  else: