From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 4 Oct 2014 21:45:15 +0000 (-0400)
Subject: Merge: #11866: Eliminate race condition in the computation of names for new threads.
X-Git-Tag: v3.5.0a1~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5387c0d6d57f0c118ddfb0b9653b5f208de2940;p=thirdparty%2FPython%2Fcpython.git

Merge: #11866: Eliminate race condition in the computation of names for new threads.
---

f5387c0d6d57f0c118ddfb0b9653b5f208de2940
diff --cc Lib/threading.py
index f7422dd9b332,37aa3b8ddc04..24cc911c203c
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@@ -3,10 -3,13 +3,10 @@@
  import sys as _sys
  import _thread
  
 -try:
 -    from time import monotonic as _time
 -except ImportError:
 -    from time import time as _time
 +from time import monotonic as _time
  from traceback import format_exc as _format_exc
  from _weakrefset import WeakSet
- from itertools import islice as _islice
+ from itertools import islice as _islice, count as _count
  try:
      from _collections import deque as _deque
  except ImportError: