Changeset 7

Show
Ignore:
Timestamp:
04/05/06 09:31:51 (3 years ago)
Author:
Jan-Klaas Kollhof
Message:

some renaming

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jsonrpc/__init__.py

    r5 r7  
    6565         
    6666         
    67 class SimpleConnectionHandler: 
     67class SimpleMessageHandler: 
    6868    def __init__(self,  DecoderClass=JSONDecoder, EncoderClass=JSONRPCEncoder, messageDelimiter=""): 
    6969        self.decoder = DecoderClass() 
    …… 
    188188 
    189189 
    190 class SimpleServiceHandler(SimpleConnectionHandler): 
     190class SimpleServiceHandler(SimpleMessageHandler): 
    191191    def __init__(self, service, DecoderClass=JSONDecoder, EncoderClass=JSONRPCEncoder, messageDelimiter=""): 
    192192        self.service = service 
    193         SimpleConnectionHandler.__init__(self, DecoderClass, EncoderClass, messageDelimiter) 
     193        SimpleMessageHandler.__init__(self, DecoderClass, EncoderClass, messageDelimiter) 
    194194        try: 
    195195            service._newConnection(self) 

  • trunk/jsonrpc/proxy.py

    r5 r7  
    5353        m = re.match(r"^jsonrpc:\/\/(.*):(\d*)$", url) 
    5454        if m: 
    55             from jsonrpc.socketserver import SocketConnectionHandler 
     55            from jsonrpc.socketserver import SocketServiceHandler 
    5656            import socket 
    5757            from threading import Thread 
    …… 
    6161            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) 
    6262            s.connect((host, port)) 
    63             conn = SocketConnectionHandler(s, localService,messageDelimiter=messageDelimiter) 
     63            conn = SocketServiceHandler(s, localService,messageDelimiter=messageDelimiter) 
    6464            PeerProxy.__init__(self, conn) 
    6565             
    …… 
    7171            conn= HTTPClientConnectionHandler(url, localService,messageDelimiter=messageDelimiter) 
    7272            PeerProxy.__init__(self, conn) 
    73      
    74     def disconnect(self): 
    75         import socket 
    76         self._conn.close() 
     73 
    7774     
    7875 

  • trunk/jsonrpc/socketserver.py

    r5 r7  
    2323from threading import Thread 
    2424     
    25 class SocketConnectionHandler(SimpleServiceHandler): 
     25     
     26class SocketServiceHandler(SimpleServiceHandler): 
    2627    def __init__(self, socket, service, messageDelimiter=""): 
    2728        self.socket = socket 
    …… 
    5758 
    5859class TCPServiceServer: 
    59     def __init__(self, service, ConnectionHandler = SocketConnectionHandler, messageDelimiter=""): 
     60    def __init__(self, service, ConnectionHandler = SocketServiceHandler, messageDelimiter=""): 
    6061        self.service = service 
    6162        self.ConnectionHandler = ConnectionHandler