diff options
| -rw-r--r-- | Lib/threading.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 06fdfc1..5ac45e1 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: @@ -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. |