summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py10
1 files changed, 8 insertions, 2 deletions
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: