[Python-checkins] CVS: python/dist/src/Lib threading.py,1.19,1.19.12.1

[Michael Hudson]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv11441

Modified Files:
      Tag: release22-maint
	threading.py 
Log Message:
Backport gvanrossum's checkin of revision 1.20:

Thread.__bootstrap(): ignore exceptions in the self.__delete() call in
the finally clause.  An exception here could happen when a daemon
thread exits after the threading module has already been trashed by
the import finalization, and there's not much of a point in trying to
insist doing the cleanup in that stage.

This should fix SF bug ##497111: active_limbo_lock error at program
exit.

2.1.2 and 2.2.1 Bugfix candidate!

(has this gone into 2.1.2 yet?)



Index: threading.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/threading.py,v
retrieving revision 1.19
retrieving revision 1.19.12.1
diff -C2 -d -r1.19 -r1.19.12.1
*** threading.py	2001/09/18 02:26:39	1.19
--- threading.py	2002/01/04 12:29:45	1.19.12.1
***************
*** 422,426 ****
          finally:
              self.__stop()
!             self.__delete()
  
      def __stop(self):
--- 422,429 ----
          finally:
              self.__stop()
!             try:
!                 self.__delete()
!             except:
!                 pass
  
      def __stop(self):