From: Brian Curtin <brian@python.org>
Date: Fri, 10 Aug 2012 04:04:42 +0000 (-0500)
Subject: Fix #15567. collections.deque wasn't imported
X-Git-Tag: v2.7.4rc1~657
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a939105a4018398aa21ee152283e3db5c7acd662;p=thirdparty%2FPython%2Fcpython.git

Fix #15567. collections.deque wasn't imported
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 22908550e09c..db9ab29c7dad 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -10,6 +10,7 @@ except ImportError:
 
 import warnings
 
+from collections import deque as _deque
 from time import time as _time, sleep as _sleep
 from traceback import format_exc as _format_exc
 
@@ -913,7 +914,7 @@ def _test():
             self.rc = Condition(self.mon)
             self.wc = Condition(self.mon)
             self.limit = limit
-            self.queue = deque()
+            self.queue = _deque()
 
         def put(self, item):
             self.mon.acquire()
diff --git a/Misc/NEWS b/Misc/NEWS
index 7010133d6de9..91ad192e0d69 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #15567: Fix NameError when running threading._test
+
 - Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog
   ended with '\'. Patch by Roger Serwy.