Add support for multipart messages and remove custom framing for pub/sub

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>txZMQ</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/txZMQ</path>
+</pydev_pathproperty>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>

txzmq/pubsub.py

@@ -21,7 +21,17 @@ def publish(self, message, tag=''):
         @param tag: message tag
         @type tag: C{str}
         """
-        self.send(tag + '\0' + message)
+        self.publish_multipart([tag, message])
+
+    def publish_multipart(self, message):
+        """
+        Broadcast L{message} with specified L{tag}
+
+        @param message: message data
+        @type message: C{list}
+        """
+
+        self.send(message)
 
 
 class ZmqSubConnection(ZmqConnection):
@@ -54,14 +64,9 @@ def messageReceived(self, message):
 
         @param message: message data
         """
-        if len(message) == 2:
-            # compatibility receiving of tag as first part
-            # of multi-part message
-            self.gotMessage(message[1], message[0])
-        else:
-            self.gotMessage(*reversed(message[0].split('\0', 1)))
-
-    def gotMessage(self, message, tag):
+        self.gotMessage(*message)
+
+    def gotMessage(self, *args):
         """
         Called on incoming message recevied by subscriber
 

txzmq/test/test_pubsub.py

@@ -16,7 +16,7 @@
 
 
 class ZmqTestSubConnection(ZmqSubConnection):
-    def gotMessage(self, message, tag):
+    def gotMessage(self, tag, message):
         if not hasattr(self, 'messages'):
             self.messages = []
 
@@ -64,10 +64,10 @@ def tearDown(self):
 
     def test_send_recv(self):
         r = ZmqTestSubConnection(
-            self.factory, ZmqEndpoint(ZmqEndpointType.bind, "ipc://test-sock"))
+            self.factory, ZmqEndpoint(ZmqEndpointType.bind, "inproc://test-sock"))
         s = ZmqPubConnection(
             self.factory, ZmqEndpoint(ZmqEndpointType.connect,
-                                      "ipc://test-sock"))
+                                      "inproc://test-sock"))
 
         r.subscribe('tag')
 

txzmq/test/test_reqrep.py

@@ -25,9 +25,9 @@ class ZmqREQREPConnectionTestCase(unittest.TestCase):
 
     def setUp(self):
         self.factory = ZmqFactory()
-        b = ZmqEndpoint(ZmqEndpointType.bind, "ipc://#3")
+        b = ZmqEndpoint(ZmqEndpointType.bind, "inproc://#3")
         self.r = ZmqTestREPConnection(self.factory, b)
-        c = ZmqEndpoint(ZmqEndpointType.connect, "ipc://#3")
+        c = ZmqEndpoint(ZmqEndpointType.connect, "inproc://#3")
         self.s = ZmqREQConnection(self.factory, c, identity='client')
 
     def tearDown(self):