From bdec11fde7905c69c3bc67b0b0df86ae557d2236 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 5 Nov 2009 13:49:14 +0000
Subject: [PATCH] Merged revisions 76117 via svnmerge from
 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.
........
---
 Lib/_threading_local.py | 8 +++++---
 Lib/threading.py        | 4 ++++
 Misc/NEWS               | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Lib/_threading_local.py b/Lib/_threading_local.py
index 6d770350ffc..6e8a8d85a79 100644
--- a/Lib/_threading_local.py
+++ b/Lib/_threading_local.py
@@ -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
 
diff --git a/Lib/threading.py b/Lib/threading.py
index 88101b0cb55..d5412e935c7 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -798,6 +798,10 @@ def active_count():
 
 activeCount = active_count
 
+def _enumerate():
+    # Same as enumerate(), but without the lock. Internal use only.
+    return list(_active.values()) + list(_limbo.values())
+
 def enumerate():
     with _active_limbo_lock:
         return list(_active.values()) + list(_limbo.values())
diff --git a/Misc/NEWS b/Misc/NEWS
index 1e2a79f1458..1e93aaa7d68 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,9 @@ C-API
 Library
 -------
 
+- Issue #7264: Fix a possible deadlock when deallocating thread-local objects
+  which are part of a reference cycle.
+
 - Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
   objects on 64-bit systems.  Patch by Michael Broghton.