From 401edd69cf23f7f102aece55e05157daf1b87f9f Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 17 Dec 2010 17:42:16 +0000
Subject: Issue #4188: Avoid creating dummy thread objects when logging
 operations from the threading module (with the internal verbose flag
 activated).

---
 Lib/threading.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Lib/threading.py')

diff --git a/Lib/threading.py b/Lib/threading.py
index b6c1e5ddab..01c27b85e6 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -55,8 +55,14 @@ if __debug__:
         def _note(self, format, *args):
             if self._verbose:
                 format = format % args
-                format = "%s: %s\n" % (
-                    current_thread().name, format)
+                # Issue #4188: calling current_thread() can incur an infinite
+                # recursion if it has to create a DummyThread on the fly.
+                ident = _get_ident()
+                try:
+                    name = _active[ident].name
+                except KeyError:
+                    name = "<OS thread %d>" % ident
+                format = "%s: %s\n" % (name, format)
                 _sys.stderr.write(format)
 
 else:
-- 
cgit v1.2.1