diff --git a/Lib/threading.py b/Lib/threading.py index 0438e1f5209..27a5511ddc2 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -11,6 +11,7 @@ except ImportError: import warnings from collections import deque as _deque +from itertools import count as _count from time import time as _time, sleep as _sleep from traceback import format_exc as _format_exc @@ -623,11 +624,10 @@ class _Event(_Verbose): self.__cond.release() # Helper to generate new thread names -_counter = 0 +_counter = _count().next +_counter() # Consume 0 so first non-main thread has id 1. def _newname(template="Thread-%d"): - global _counter - _counter = _counter + 1 - return template % _counter + return template % _counter() # Active thread administration _active_limbo_lock = _allocate_lock() diff --git a/Misc/NEWS b/Misc/NEWS index 6dc092e069a..5144b5082d0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -34,6 +34,9 @@ Core and Builtins Library ------- +- Issue #11866: Eliminated race condition in the computation of names + for new threads. + - Issue #22219: The zipfile module CLI now adds entries for directories (including empty directories) in ZIP file.