diff options
| author | Georg Brandl <georg@python.org> | 2008-05-24 18:31:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-24 18:31:28 (GMT) |
| commit | e152a77d96df7479ce798ebd5baee7d41af99db3 (patch) | |
| tree | 3d13fa9679d1ae46e5dec0af2ddf09f6edd45561 /Lib/idlelib | |
| parent | 6acb075f03ec5ecb8d89bc56fae99dc8c5a510ab (diff) | |
| download | cpython-e152a77d96df7479ce798ebd5baee7d41af99db3.zip cpython-e152a77d96df7479ce798ebd5baee7d41af99db3.tar.gz cpython-e152a77d96df7479ce798ebd5baee7d41af99db3.tar.bz2 | |
socketserver renaming reversal part 3: move the module into the right
place and fix all references to it. Closes #2926.
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/rpc.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index e0bcf2c..cdfdac4 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -5,7 +5,7 @@ connect to the Idle process, which listens for the connection. Since Idle has has only one client per server, this was not a limitation. +---------------------------------+ +-------------+ - | socketserver.BaseRequestHandler | | SocketIO | + | SocketServer.BaseRequestHandler | | SocketIO | +---------------------------------+ +-------------+ ^ | register() | | | unregister()| @@ -31,7 +31,7 @@ import sys import os import socket import select -import socketserver +import SocketServer import struct import cPickle as pickle import threading @@ -66,12 +66,12 @@ copy_reg.pickle(types.CodeType, pickle_code, unpickle_code) BUFSIZE = 8*1024 LOCALHOST = '127.0.0.1' -class RPCServer(socketserver.TCPServer): +class RPCServer(SocketServer.TCPServer): def __init__(self, addr, handlerclass=None): if handlerclass is None: handlerclass = RPCHandler - socketserver.TCPServer.__init__(self, addr, handlerclass) + SocketServer.TCPServer.__init__(self, addr, handlerclass) def server_bind(self): "Override TCPServer method, no bind() phase for connecting entity" @@ -492,7 +492,7 @@ class RemoteProxy(object): def __init__(self, oid): self.oid = oid -class RPCHandler(socketserver.BaseRequestHandler, SocketIO): +class RPCHandler(SocketServer.BaseRequestHandler, SocketIO): debugging = False location = "#S" # Server @@ -500,10 +500,10 @@ class RPCHandler(socketserver.BaseRequestHandler, SocketIO): def __init__(self, sock, addr, svr): svr.current_handler = self ## cgt xxx SocketIO.__init__(self, sock) - socketserver.BaseRequestHandler.__init__(self, sock, addr, svr) + SocketServer.BaseRequestHandler.__init__(self, sock, addr, svr) def handle(self): - "handle() method required by socketserver" + "handle() method required by SocketServer" self.mainloop() def get_remote_proxy(self, oid): |