mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 76117 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76117 | antoine.pitrou | 2009-11-05 14:42:29 +0100 (jeu., 05 nov. 2009) | 5 lines

  Issue #7264: Fix a possible deadlock when deallocating thread-local objects
  which are part of a reference cycle.
........
This commit is contained in:
Antoine Pitrou 2009-11-05 13:49:14 +00:00
parent cfed029c42
commit bdec11fde7
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/_threading_local.py
View file

@ -217,10 +217,12 @@ class local(_localbase):
key = object.__getattribute__(self, '_local__key')
try:
threads = list(threading.enumerate())
# We use the non-locking API since we might already hold the lock
# (__del__ can be called at any point by the cyclic GC).
threads = threading._enumerate()
except:
# If enumerate fails, as it seems to do during
# shutdown, we'll skip cleanup under the assumption
# If enumerating the current threads fails, as it seems to do
# during shutdown, we'll skip cleanup under the assumption
# that there is nothing to clean up.
return