[Neo-report] r1869 vincent - in /trunk/neo: connection.py protocol.py tests/testConnection.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Feb 26 15:45:22 2010
New Revision: 1869

Log:
Replace "__call__" by "encode" so it is easier to identify its users.

Modified:
    trunk/neo/connection.py
    trunk/neo/protocol.py
    trunk/neo/tests/testConnection.py

Modified: trunk/neo/connection.py
==============================================================================
--- trunk/neo/connection.py [iso-8859-1] (original)
+++ trunk/neo/connection.py [iso-8859-1] Fri Feb 26 15:45:22 2010
@@ -418,7 +418,7 @@
         was_empty = not bool(self.write_buf)
 
         PACKET_LOGGER.dispatch(self, packet, ' to ')
-        self.write_buf += packet()
+        self.write_buf += packet.encode()
 
         if was_empty:
             # enable polling for writing.

Modified: trunk/neo/protocol.py
==============================================================================
--- trunk/neo/protocol.py [iso-8859-1] (original)
+++ trunk/neo/protocol.py [iso-8859-1] Fri Feb 26 15:45:22 2010
@@ -263,7 +263,7 @@
     def getType(self):
         return self.__class__
 
-    def __call__(self):
+    def encode(self):
         """ Encode a packet as a string to send it over the network """
         content = self._body
         length = PACKET_HEADER_SIZE + len(content)

Modified: trunk/neo/tests/testConnection.py
==============================================================================
--- trunk/neo/tests/testConnection.py [iso-8859-1] (original)
+++ trunk/neo/tests/testConnection.py [iso-8859-1] Fri Feb 26 15:45:22 2010
@@ -421,7 +421,7 @@
 
     def test_07_Connection_addPacket(self):
         # no connector
-        p = Mock({"__call__" : "testdata"})
+        p = Mock({"encode" : "testdata"})
         em = Mock()
         handler = Mock()
         bc = Connection(em, handler, connector_handler=DoNothingConnector,
@@ -494,7 +494,7 @@
                 (("127.0.0.1", 2132), self.getNewUUID()))
         p = Packets.AnswerPrimary(self.getNewUUID(), master_list)
         p.setId(1)
-        bc.read_buf += p()
+        bc.read_buf += p.encode()
         self.assertEqual(len(bc.event_dict), 0)
         bc.analyse()
         # check packet decoded
@@ -528,7 +528,7 @@
                 (("127.0.0.1", 2132), self.getNewUUID()))
         p1 = Packets.AnswerPrimary(self.getNewUUID(), master_list)
         p1.setId(1)
-        bc.read_buf += p1()
+        bc.read_buf += p1.encode()
         # packet 2
         master_list = (
                 (("127.0.0.1", 2135), self.getNewUUID()),
@@ -541,7 +541,7 @@
                 (("127.0.0.1", 2132), self.getNewUUID()))
         p2 = Packets.AnswerPrimary( self.getNewUUID(), master_list)
         p2.setId(2)
-        bc.read_buf += p2()
+        bc.read_buf += p2.encode()
         self.assertEqual(len(bc.read_buf), len(p1) + len(p2))
         self.assertEqual(len(bc.event_dict), 0)
         bc.analyse()
@@ -599,7 +599,7 @@
                 (("127.0.0.1", 2132), self.getNewUUID()))
         p = Packets.AnswerPrimary(self.getNewUUID(), master_list)
         p.setId(1)
-        bc.read_buf += p()
+        bc.read_buf += p.encode()
         self.assertEqual(len(bc.event_dict), 0)
         bc.expectMessage(1)
         self.assertEqual(len(bc.event_dict), 1)
@@ -729,7 +729,7 @@
             uuid = self.getNewUUID()
             p = Packets.AnswerPrimary(uuid, master_list)
             p.setId(1)
-            return p()
+            return p.encode()
         DoNothingConnector.receive = receive
         connector = DoNothingConnector()
         bc = Connection(em, handler, connector_handler=DoNothingConnector,