diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:51:19 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-05 13:51:19 (GMT) |
commit | a954607cd3c27bc55d3f42af54d0ba1636f357a9 (patch) | |
tree | c74a458560abaadd349c24755ab58ddaab5f78fe /Lib/threading.py | |
parent | 142d236442a52f458f6fece1c29e2cd8678cfd23 (diff) | |
download | cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.zip cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.tar.gz cpython-a954607cd3c27bc55d3f42af54d0ba1636f357a9.tar.bz2 |
Merged revisions 76119 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76119 | antoine.pitrou | 2009-11-05 14:49:14 +0100 (jeu., 05 nov. 2009) | 10 lines
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.
........
................
Diffstat (limited to 'Lib/threading.py')
-rw-r--r-- | Lib/threading.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 88101b0..d5412e9 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()) |