fixup name kwarg pop

eventmq · Apr 19, 2017 · e1c4a42 · e1c4a42
1 parent 16f2ca3
commit e1c4a42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/eventmq/jobmanager.py b/eventmq/jobmanager.py
@@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs):
 
         #: Define the name of this JobManager instance. Useful to know when
         #: referring to the logs.
-        self.name = kwargs.pop('name') or generate_device_name()
+        self.name = kwargs.pop('name', None) or generate_device_name()
         logger.info('Initializing JobManager {}...'.format(self.name))
 
         #: keep track of workers

diff --git a/eventmq/sender.py b/eventmq/sender.py
@@ -141,7 +141,7 @@ def rebuild(self, *args, **kwargs):
         if sys.version[0] == '2':
             self.zsocket.setsockopt(zmq.IDENTITY, self.name)
         else:
-            self.zsocket.setsockopt_string(zmq.IDENTITY, self.name)
+            self.zsocket.setsockopt_string(zmq.IDENTITY, str(self.name))
 
         self.status = constants.STATUS.ready
 

diff --git a/eventmq/tests/test_sender.py b/eventmq/tests/test_sender.py
@@ -35,7 +35,7 @@ def test_send_multipart(self):
 
         self.assert_(socket.poll() != 0)
         msg = socket.recv_multipart()
-        self.assertEqual(msg[0], self.sender.name)
+        self.assertEqual(msg[0].decode('ascii'), self.sender.name)
         self.assertEqual(msg[1], b'')
         self.assertEqual(msg[2], b'1')
         self.assertEqual(msg[3], b'Hello!')