From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 17 Dec 2010 17:45:12 +0000 (+0000)
Subject: Merged revisions 87341 via svnmerge from
X-Git-Tag: v2.7.2rc1~466
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47900cfa73ee35313f019d1efdfd1b8e8e0b76f8;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 87341 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87341 | antoine.pitrou | 2010-12-17 18:42:16 +0100 (ven., 17 déc. 2010) | 4 lines

  Issue #4188: Avoid creating dummy thread objects when logging operations
  from the threading module (with the internal verbose flag activated).
........
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 06fdfc14c226..5ac45e1abfc5 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -63,8 +63,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:
diff --git a/Misc/NEWS b/Misc/NEWS
index aca1fbb99e7a..150dee8b4e2f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,10 @@ Core and Builtins
 
 Library
 -------
+
+- Issue #4188: Avoid creating dummy thread objects when logging operations
+  from the threading module (with the internal verbose flag activated).
+
 - Issue #9721: Fix the behavior of urljoin when the relative url starts with a
   ';' character. Patch by Wes Chow.