Fix Python 2/3 compatibility issues

- fix params for `zsocket.send_multipart()`

4 files changed, 22 insertions, 14 deletions

diff --git a/eventmq/publisher.py b/eventmq/publisher.py
index cf29a2e..068c31f 100644
--- a/eventmq/publisher.py
+++ b/eventmq/publisher.py
@@ -67,7 +67,8 @@ class Publisher():
 
     def publish(self, topic, msg):
         logger.debug("Notifying topic: {}".format(topic))
-        return self.zsocket.send_multipart([topic, msg])
+        return self.zsocket.send_multipart([six.ensure_binary(topic),
+                                            six.ensure_binary(msg)])
 
     @property
     def ready(self):
diff --git a/eventmq/tests/utils.py b/eventmq/tests/utils.py
index 23f34c0..2d275ed 100644
--- a/eventmq/tests/utils.py
+++ b/eventmq/tests/utils.py
@@ -14,6 +14,7 @@
 # along with eventmq.  If not, see <http://www.gnu.org/licenses/>.
 import uuid
 
+import six
 import zmq
 
 from .. import conf, constants
@@ -48,12 +49,12 @@ def send_raw_INFORM(sock, type_, queues=(conf.DEFAULT_QUEUE_NAME,)):
     """
     msgid = str(uuid.uuid4())
     tracker = sock.zsocket.send_multipart((
-        '',
-        constants.PROTOCOL_VERSION,
-        'INFORM',
-        msgid,
-        ','.join(queues),
-        type_
+        b'',
+        six.ensure_binary(constants.PROTOCOL_VERSION),
+        b'INFORM',
+        six.ensure_binary(msgid),
+        six.ensure_binary(','.join(queues)),
+        six.ensure_binary(type_)
     ), copy=False, track=True)
     tracker.wait(1)
 
@@ -72,10 +73,10 @@ def send_raw_READY(sock):
     """
     msgid = str(uuid.uuid4())
     tracker = sock.zsocket.send_multipart((
-        '',
-        constants.PROTOCOL_VERSION,
-        'READY',
-        msgid
+        b'',
+        six.ensure_binary(constants.PROTOCOL_VERSION),
+        b'READY',
+        six.ensure_binary(msgid)
     ), copy=False, track=True)
     tracker.wait(1)
 
diff --git a/eventmq/utils/classes.py b/eventmq/utils/classes.py
index 14409ea..50047a8 100644
--- a/eventmq/utils/classes.py
+++ b/eventmq/utils/classes.py
@@ -411,6 +411,10 @@ class ZMQSendMixin(object):
 
         msg = encodify(headers + message)
 
+        # Decode bytes to strings in python3
+        if sys.version[0] == '3' and type(msg[0] in (bytes,)):
+            msg = [m.decode() for m in msg]
+
         # If it's not at least 4 frames long then most likely it isn't an
         # eventmq message
         if len(msg) > 4 and \
@@ -419,7 +423,7 @@ class ZMQSendMixin(object):
             logger.debug('Sending message: %s' % str(msg))
 
         try:
-            self.zsocket.send_multipart(msg,
+            self.zsocket.send_multipart([six.ensure_binary(m) for m in msg],
                                         flags=zmq.NOBLOCK)
         except zmq.error.ZMQError as e:
             if 'No route' in str(e):
diff --git a/eventmq/utils/messages.py b/eventmq/utils/messages.py
index d652c4c..33e53d3 100644
--- a/eventmq/utils/messages.py
+++ b/eventmq/utils/messages.py
@@ -18,6 +18,8 @@
 """
 import logging
 
+import six
+
 from . import random_characters
 from .. import conf, constants, exceptions
 
@@ -153,7 +155,7 @@ def fwd_emqp_router_message(socket, recipient_id, payload):
     Args:
         socket: socket to send the message with
         recipient_id (str): the id of the connected device to reply to
-        payload (tuple): The message to send. The first frame should be an
+        payload (list): The message to send. The first frame should be an
             empty string
     """
     import zmq
@@ -166,7 +168,7 @@ def fwd_emqp_router_message(socket, recipient_id, payload):
     if conf.SUPER_DEBUG:
         logger.debug('Forwarding message: {}'.format(str(payload)))
     try:
-        socket.zsocket.send_multipart(payload,
+        socket.zsocket.send_multipart([six.ensure_binary(x) for x in payload],
                                       flags=zmq.NOBLOCK)
     except zmq.error.ZMQError as e:
         if e.errno in errnos: