[Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.28,1.29

2001年4月12日 13:27:33 -0700

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv8456
Modified Files:
	pydoc.py 
Log Message:
Fix call to ModuleScanner from GUI search interface.
Fix handling of unbound top-level methods.
Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** pydoc.py	2001年04月12日 19:53:52	1.28
--- pydoc.py	2001年04月12日 20:27:31	1.29
***************
*** 581,586 ****
 skipdocs = 0
 if inspect.ismethod(object):
 if cl:
- imclass = object.im_class
 if imclass is not cl:
 url = '%s.html#%s-%s' % (
--- 581,586 ----
 skipdocs = 0
 if inspect.ismethod(object):
+ imclass = object.im_class
 if cl:
 if imclass is not cl:
 url = '%s.html#%s-%s' % (
***************
*** 590,596 ****
 skipdocs = 1
 else:
! note = (object.im_self and
! ' method of %s instance' + object.im_self.__class__ or
! ' unbound %s method' % object.im_class.__name__)
 object = object.im_func
 
--- 590,597 ----
 skipdocs = 1
 else:
! inst = object.im_self
! note = (inst and
! ' method of %s instance' % classname(inst.__class__, mod) or
! ' unbound %s method' % classname(imclass, mod))
 object = object.im_func
 
***************
*** 848,854 ****
 skipdocs = 1
 else:
! note = (object.im_self and
! ' method of %s instance' + object.im_self.__class__ or
! ' unbound %s method' % classname(imclass, mod))
 object = object.im_func
 
--- 849,856 ----
 skipdocs = 1
 else:
! inst = object.im_self
! note = (inst and
! ' method of %s instance' % classname(inst.__class__, mod) or
! ' unbound %s method' % classname(imclass, mod))
 object = object.im_func
 
***************
*** 1700,1704 ****
 self.scanner = ModuleScanner()
 threading.Thread(target=self.scanner.run,
! args=(key, self.update, self.done)).start()
 
 def update(self, path, modname, desc):
--- 1702,1706 ----
 self.scanner = ModuleScanner()
 threading.Thread(target=self.scanner.run,
! args=(self.update, key, self.done)).start()
 
 def update(self, path, modname, desc):