Make Dispatcher.pop expect a msg_id instead of a message.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1022 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/handlers/__init__.py

@@ -38,7 +38,7 @@ class BaseHandler(EventHandler):
     def packetReceived(self, conn, packet):
         """Redirect all received packet to dispatcher thread."""
         if packet.isResponse():
-            queue = self.dispatcher.pop(conn, packet, None)
+            queue = self.dispatcher.pop(conn, packet.getId(), None)
             if queue is None:
                 raise UnexpectedPacketError('Unexpected response packet')
             queue.put((conn, packet))

neo/dispatcher.py

@@ -23,9 +23,9 @@ class Dispatcher:
     def __init__(self):
         self.message_table = {}
 
-    def pop(self, conn, packet, default=MARKER):
+    def pop(self, conn, msg_id, default=MARKER):
         """Retrieve register-time provided payload."""
-        key = (id(conn), packet.getId())
+        key = (id(conn), msg_id)
         if default is MARKER:
             result = self.message_table.pop(key)
         else: