Author: gregory.p.smith Date: Sun Feb 28 19:40:12 2010 New Revision: 78518 Log: Merged revisions 78517 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78517 | gregory.p.smith | 2010-02-28 10:36:09 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_threading.py python/branches/release26-maint/Lib/threading.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/test/test_threading.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_threading.py (original) +++ python/branches/release26-maint/Lib/test/test_threading.py Sun Feb 28 19:40:12 2010 @@ -219,6 +219,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise thread.error() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except thread.error: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/branches/release26-maint/Lib/threading.py ============================================================================== --- python/branches/release26-maint/Lib/threading.py (original) +++ python/branches/release26-maint/Lib/threading.py Sun Feb 28 19:40:12 2010 @@ -470,7 +470,12 @@ _active_limbo_lock.acquire() _limbo[self] = self _active_limbo_lock.release() - _start_new_thread(self.__bootstrap, ()) + try: + _start_new_thread(self.__bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self.__started.wait() def run(self): Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Feb 28 19:40:12 2010 @@ -232,6 +232,9 @@ - Issue #5037: Proxy the __unicode__ special method to __unicode__ instead of __str__. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------