[svn] commit: r548 - in /branches/parkinglot/src: bin/msgq/msgq.py lib/cc/python/ISC/CC/Message.py lib/cc/python/ISC/CC/session.py

[BIND 10 source code commits]

Author: mgraff
Date: Wed Jan 27 00:49:04 2010
New Revision: 548

Log:
fix up per review comments

Modified:
    branches/parkinglot/src/bin/msgq/msgq.py
    branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py
    branches/parkinglot/src/lib/cc/python/ISC/CC/session.py

Modified: branches/parkinglot/src/bin/msgq/msgq.py
==============================================================================
--- branches/parkinglot/src/bin/msgq/msgq.py (original)
+++ branches/parkinglot/src/bin/msgq/msgq.py Wed Jan 27 00:49:04 2010
@@ -34,7 +34,8 @@
         target = ( group, instance )
         if target in self.subscriptions:
             print("Appending to existing target")
-            self.subscriptions[target].append(socket)
+            if socket not in self.subscriptions[target]:
+                self.subscriptions[target].append(socket)
         else:
             print("Creating new target")
             self.subscriptions[target] = [ socket ]
@@ -78,7 +79,7 @@
         process listens on. If verbose is True, then the MsgQ reports
         what it is doing.
         """
-        self.verbose = True
+        self.verbose = verbose
         self.c_channel_port = c_channel_port
         self.poller = None
         self.kqueue = None

Modified: branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py
==============================================================================
--- branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py (original)
+++ branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py Wed Jan 27 00:49:04 2010
@@ -48,6 +48,8 @@
     ... wire_partial = Message._encode_tag('this')
     """
     binary = bytes(tag, 'utf-8')
+    if len(binary) > 255:
+        raise ArgumentError("tag is too long (max 255 encoded bytes)")
     return(struct.pack(">B", len(binary))) + binary
 
 def _encode_length_and_type(data, datatype):
@@ -86,14 +88,6 @@
     """Pack a dict (hash) and its type/length prefix."""
     data = _encode_hash(item)
     return (_encode_length_and_type(data, _ITEM_HASH))
-
-def _encode_utf8(item):
-    """Encode a string (utf-8).  More or less identity."""
-    return (item)
-
-def _encode_blob(item):
-    """Encode a blob (data).  More or less identity."""
-    return (item)
 
 def _pack_nil():
     """Encode a nil (NULL, None) item."""

Modified: branches/parkinglot/src/lib/cc/python/ISC/CC/session.py
==============================================================================
--- branches/parkinglot/src/lib/cc/python/ISC/CC/session.py (original)
+++ branches/parkinglot/src/lib/cc/python/ISC/CC/session.py Wed Jan 27 00:49:04 2010
@@ -28,8 +28,7 @@
         self._socket = None
         self._lname = None
         self._recvbuffer = bytearray()
-        self._recvlength = None
-        self._sendbuffer = bytearray()
+        self._recvlength = 0
         self._sequence = 1
         self._closed = False
 
@@ -94,7 +93,7 @@
         else:
             self._socket.setblocking(1)
 
-        if self._recvlength == None:
+        if self._recvlength == 0:
             length = 4
             length -= len(self._recvbuffer)
             try:
@@ -122,7 +121,7 @@
             length -= len(data)
         data = self._recvbuffer
         self._recvbuffer = bytearray()
-        self._recvlength = None
+        self._recvlength = 0
         return (data)
 
     def _next_sequence(self):