diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-12 02:31:37 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-12 02:31:37 (GMT) |
| commit | ce261952e640b2d09ada1b160f0cfa37db32f928 (patch) | |
| tree | 17b1c2129377435cbaf0169f702b78a61407b90f /Lib/idlelib/rpc.py | |
| parent | 6f1e619b414a93084efbb7244034a3546899fa4b (diff) | |
| download | cpython-ce261952e640b2d09ada1b160f0cfa37db32f928.zip cpython-ce261952e640b2d09ada1b160f0cfa37db32f928.tar.gz cpython-ce261952e640b2d09ada1b160f0cfa37db32f928.tar.bz2 | |
Renamed the SocketServer module to 'socketserver'.
Merged revisions 63132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63132 | alexandre.vassalotti | 2008-05-11 22:11:22 -0400 (Sun, 11 May 2008) | 4 lines
Updated all import statements to use the new socketserver module name.
Renamed socketserver module in its own documentation.
Renamed documentation references.
........
Diffstat (limited to 'Lib/idlelib/rpc.py')
| -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 13ef372..e555ffb 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 pickle import threading @@ -66,12 +66,12 @@ copyreg.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): |