diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 19:59:59 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-11 19:59:59 (GMT) |
| commit | f260e443ac07bc794fc9409096679b94528868e2 (patch) | |
| tree | 244c7542db14c43a2fe52ce5c8b6373d17a19e7f /Lib/idlelib | |
| parent | 4e3e21e2cf896295d568828f2d20dc5a25feff54 (diff) | |
| download | cpython-f260e443ac07bc794fc9409096679b94528868e2.zip cpython-f260e443ac07bc794fc9409096679b94528868e2.tar.gz cpython-f260e443ac07bc794fc9409096679b94528868e2.tar.bz2 | |
Rename Queue module to queue.
Updated documentation to use new name.
Merged revisions 63077 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63077 | alexandre.vassalotti | 2008-05-11 15:39:48 -0400 (Sun, 11 May 2008) | 3 lines
Added stub for the Queue module to be renamed in 3.0.
Use the 3.0 module name to avoid spurious warnings.
........
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/rpc.py | 8 | ||||
| -rw-r--r-- | Lib/idlelib/run.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 109797c..13ef372 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -35,7 +35,7 @@ import SocketServer import struct import pickle import threading -import Queue +import queue import traceback import copyreg import types @@ -117,8 +117,8 @@ class RPCServer(SocketServer.TCPServer): #----------------- 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 @@ class SocketIO(object): # 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 diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 63880d6..b731310 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -5,7 +5,7 @@ import socket import traceback import thread import threading -import Queue +import queue from idlelib import CallTips from idlelib import AutoComplete @@ -85,7 +85,7 @@ def main(del_exitfunc=False): 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) |