Index: Lib/idlelib/rpc.py =================================================================== --- Lib/idlelib/rpc.py (revision 57339) +++ Lib/idlelib/rpc.py (working copy) @@ -35,7 +35,7 @@ import struct import pickle import threading -import Queue +import queue import traceback import copy_reg import types @@ -117,8 +117,8 @@ #----------------- end class RPCServer -------------------- objecttable = {} -request_queue = Queue.Queue(0) -response_queue = Queue.Queue(0) +request_queue = queue.Queue(0) +response_queue = queue.Queue(0) class SocketIO(object): @@ -413,7 +413,7 @@ # send queued response if there is one available try: qmsg = response_queue.get(0) - except Queue.Empty: + except queue.Empty: pass else: seq, response = qmsg Index: Lib/idlelib/run.py =================================================================== --- Lib/idlelib/run.py (revision 57339) +++ Lib/idlelib/run.py (working copy) @@ -6,7 +6,7 @@ import traceback import thread import threading -import Queue +import queue from idlelib import CallTips from idlelib import AutoComplete @@ -85,7 +85,7 @@ continue try: seq, request = rpc.request_queue.get(block=True, timeout=0.05) - except Queue.Empty: + except queue.Empty: continue method, args, kwargs = request ret = method(*args, **kwargs) @@ -150,7 +150,7 @@ sys.last_type, sys.last_value, sys.last_traceback = excinfo tbe = traceback.extract_tb(tb) print('Traceback (most recent call last):', file=efile) - exclude = ("run.py", "rpc.py", "threading.py", "Queue.py", + exclude = ("run.py", "rpc.py", "threading.py", "queue.py", "RemoteDebugger.py", "bdb.py") cleanup_traceback(tbe, exclude) traceback.print_list(tbe, file=efile) Index: Lib/test/test_socket.py =================================================================== --- Lib/test/test_socket.py (revision 57339) +++ Lib/test/test_socket.py (working copy) @@ -7,7 +7,7 @@ import select import time import thread, threading -import Queue +import queue import sys from weakref import proxy import signal @@ -97,7 +97,7 @@ self.server_ready = threading.Event() self.client_ready = threading.Event() self.done = threading.Event() - self.queue = Queue.Queue(1) + self.queue = queue.Queue(1) # Do some munging to start the client test. methodname = self.id() Index: Lib/test/test_queue.py =================================================================== --- Lib/test/test_queue.py (revision 57339) +++ Lib/test/test_queue.py (working copy) @@ -1,6 +1,6 @@ # Some simple Queue module tests, plus some failure conditions # to ensure the Queue locks remain stable. -import Queue +import queue import sys import threading import time @@ -79,21 +79,21 @@ class FailingQueueException(Exception): pass -class FailingQueue(Queue.Queue): +class FailingQueue(queue.Queue): def __init__(self, *args): self.fail_next_put = False self.fail_next_get = False - Queue.Queue.__init__(self, *args) + queue.Queue.__init__(self, *args) def _put(self, item): if self.fail_next_put: self.fail_next_put = False raise FailingQueueException, "You Lose" - return Queue.Queue._put(self, item) + return queue.Queue._put(self, item) def _get(self): if self.fail_next_get: self.fail_next_get = False raise FailingQueueException, "You Lose" - return Queue.Queue._get(self) + return queue.Queue._get(self) def FailingQueueTest(q): if not q.empty(): @@ -193,12 +193,12 @@ try: q.put("full", block=0) raise TestFailed("Didn't appear to block with a full queue") - except Queue.Full: + except queue.Full: pass try: q.put("full", timeout=0.01) raise TestFailed("Didn't appear to time-out with a full queue") - except Queue.Full: + except queue.Full: pass # Test a blocking put _doBlockingTest(q.put, ("full",), q.get, ()) @@ -210,12 +210,12 @@ try: q.get(block=0) raise TestFailed("Didn't appear to block with an empty queue") - except Queue.Empty: + except queue.Empty: pass try: q.get(timeout=0.01) raise TestFailed("Didn't appear to time-out with an empty queue") - except Queue.Empty: + except queue.Empty: pass # Test a blocking get _doBlockingTest(q.get, (), q.put, ('empty',)) @@ -260,13 +260,13 @@ raise TestFailed("Did not detect task count going negative") def test(): - q = Queue.Queue() + q = queue.Queue() QueueTaskDoneTest(q) QueueJoinTest(q) QueueJoinTest(q) QueueTaskDoneTest(q) - q = Queue.Queue(QUEUE_SIZE) + q = queue.Queue(QUEUE_SIZE) # Do it a couple of times on the same queue SimpleQueueTest(q) SimpleQueueTest(q) Index: Lib/test/test_dummy_thread.py =================================================================== --- Lib/test/test_dummy_thread.py (revision 57339) +++ Lib/test/test_dummy_thread.py (working copy) @@ -7,7 +7,7 @@ """ import dummy_thread as _thread import time -import Queue +import queue import random import unittest from test import test_support @@ -124,7 +124,7 @@ """Use to test _thread.start_new_thread() passes args properly.""" queue.put((arg1, arg2)) - testing_queue = Queue.Queue(1) + testing_queue = queue.Queue(1) _thread.start_new_thread(arg_tester, (testing_queue, True, True)) result = testing_queue.get() self.failUnless(result[0] and result[1], @@ -148,7 +148,7 @@ queue.put(_thread.get_ident()) thread_count = 5 - testing_queue = Queue.Queue(thread_count) + testing_queue = queue.Queue(thread_count) if test_support.verbose: print() print("*** Testing multiple thread creation "\ Index: Lib/test/test___all__.py =================================================================== --- Lib/test/test___all__.py (revision 57339) +++ Lib/test/test___all__.py (working copy) @@ -33,7 +33,6 @@ self.check_all("CGIHTTPServer") self.check_all("ConfigParser") self.check_all("Cookie") - self.check_all("Queue") self.check_all("SimpleHTTPServer") self.check_all("SocketServer") self.check_all("UserString") @@ -108,6 +107,7 @@ self.check_all("pty") self.check_all("py_compile") self.check_all("pyclbr") + self.check_all("queue") self.check_all("quopri") self.check_all("random") self.check_all("re")