Merge branch 'master' into loggers_cleanup

ethifus · ethifus · commit c3193fc243b3 · 2015-10-29T14:55:40.000+01:00
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 
 requirements = [
     'gevent>=1.0',
-    'msgpack-python',
+    'msgpack-python>=0.4.0',
     'pyzmq>=13.1.0'
 ]
 if sys.version_info < (2, 7):
diff --git a/tests/test_events.py b/tests/test_events.py
@@ -169,3 +169,59 @@ def test_events_push_pull():
         print event
         assert event.name == 'myevent'
         assert list(event.args) == [x]
+
+
+def test_msgpack():
+    context = zerorpc.Context()
+    event = zerorpc.Event('myevent', ('a',), context=context)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == str
+
+    packed = event.pack()
+    event = event.unpack(packed)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == str
+
+    event = zerorpc.Event('myevent', (u'a',), context=context)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == unicode
+
+    packed = event.pack()
+    event = event.unpack(packed)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == unicode
+
+    event = zerorpc.Event('myevent', (u'a', 'b'), context=context)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == unicode
+    assert type(event.args[1]) == str
+
+    packed = event.pack()
+    event = event.unpack(packed)
+    print event
+    assert type(event.name) == str
+    for key in event.header.keys():
+        assert type(key) == str
+    assert type(event.header['message_id']) == str
+    assert type(event.args[0]) == unicode
+    assert type(event.args[1]) == str
diff --git a/zerorpc/events.py b/zerorpc/events.py
@@ -192,11 +192,11 @@ def identity(self, v):
         self._identity = v
 
     def pack(self):
-        return msgpack.Packer().pack((self._header, self._name, self._args))
+        return msgpack.Packer(use_bin_type=True).pack((self._header, self._name, self._args))
 
     @staticmethod
     def unpack(blob):
-        unpacker = msgpack.Unpacker()
+        unpacker = msgpack.Unpacker(encoding='utf-8')
         unpacker.feed(blob)
         unpacked_msg = unpacker.unpack()
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`
`37`	`37`	`requirements = [`
`38`	`38`	`'gevent>=1.0',`
`39`		`- 'msgpack-python',`
	`39`	`+ 'msgpack-python>=0.4.0',`
`40`	`40`	`'pyzmq>=13.1.0'`
`41`	`41`	`]`
`42`	`42`	`if sys.version_info < (2, 7):`