[svn] commit: r86 - in /experiments/graff-ccapi/python: ISC/CC/Message.py ISC/CC/__init__.py ISC/CC/message.py ISC/CC/session.py test.py

[BIND 10 source code commits]

Author: mgraff
Date: Mon Oct 12 15:42:26 2009
New Revision: 86

Log:
I still like Message over message

Added:
    experiments/graff-ccapi/python/ISC/CC/Message.py
      - copied, changed from r85, experiments/graff-ccapi/python/ISC/CC/message.py
Removed:
    experiments/graff-ccapi/python/ISC/CC/message.py
Modified:
    experiments/graff-ccapi/python/ISC/CC/__init__.py
    experiments/graff-ccapi/python/ISC/CC/session.py
    experiments/graff-ccapi/python/test.py

Modified: experiments/graff-ccapi/python/ISC/CC/__init__.py
==============================================================================
--- experiments/graff-ccapi/python/ISC/CC/__init__.py (original)
+++ experiments/graff-ccapi/python/ISC/CC/__init__.py Mon Oct 12 15:42:26 2009
@@ -1,2 +1,2 @@
-import message
+import Message
 from session import *

Modified: experiments/graff-ccapi/python/ISC/CC/session.py
==============================================================================
--- experiments/graff-ccapi/python/ISC/CC/session.py (original)
+++ experiments/graff-ccapi/python/ISC/CC/session.py Mon Oct 12 15:42:26 2009
@@ -17,7 +17,7 @@
 import socket
 import struct
 
-import message
+import Message
 
 class ProtocolError(Exception): pass
 
@@ -45,7 +45,7 @@
 
     def sendmsg(self, msg):
         if type(msg) == dict:
-            msg = message.to_wire(msg)
+            msg = Message.to_wire(msg)
         self._socket.setblocking(1)
         self._socket.send(struct.pack("!I", len(msg)))
         self._socket.send(msg)
@@ -53,7 +53,7 @@
     def recvmsg(self, nonblock = True):
         data = self._receive_full_buffer(nonblock)
         if data:
-            return message.from_wire(data)
+            return Message.from_wire(data)
         return None
 
     def _receive_full_buffer(self, nonblock):
@@ -115,14 +115,14 @@
             "group": group,
             "instance": instance,
             "seq": self._next_sequence(),
-            "msg": message.to_wire(msg),
+            "msg": Message.to_wire(msg),
         })
 
     def group_recvmsg(self, nonblock = True):
         msg = self.recvmsg(nonblock)
         if msg == None:
             return None
-        data = message.from_wire(msg["msg"])
+        data = Message.from_wire(msg["msg"])
         return (data, msg)
 
 if __name__ == "__main__":

Modified: experiments/graff-ccapi/python/test.py
==============================================================================
--- experiments/graff-ccapi/python/test.py (original)
+++ experiments/graff-ccapi/python/test.py Mon Oct 12 15:42:26 2009
@@ -5,10 +5,10 @@
        "none": None,
        "string": "samplestring" }
 
-s = ISC.CC.message.to_wire(ss)
+s = ISC.CC.Message.to_wire(ss)
 ISC.Util.hexdump(s)
 
-print ISC.CC.message.from_wire(s)
+print ISC.CC.Message.from_wire(s)
 
 tcp = ISC.CC.Session()
 print tcp.lname