Merge "Set unicode_errors handler to 'surrogateescape' in msgpack"

This commit is contained in:
Zuul 2019-01-15 18:47:14 +00:00 committed by Gerrit Code Review
commit 6b5bbbb148
2 changed files with 5 additions and 3 deletions

View File

@ -51,7 +51,8 @@ class Serializer(object):
self.writesock = writesock
def send(self, msg):
buf = msgpack.packb(msg, use_bin_type=True)
buf = msgpack.packb(msg, use_bin_type=True,
unicode_errors='surrogateescape')
self.writesock.sendall(buf)
def close(self):
@ -64,7 +65,8 @@ class Serializer(object):
class Deserializer(six.Iterator):
def __init__(self, readsock):
self.readsock = readsock
self.unpacker = msgpack.Unpacker(use_list=False, encoding='utf-8')
self.unpacker = msgpack.Unpacker(use_list=False, encoding='utf-8',
unicode_errors='surrogateescape')
def __iter__(self):
return self

View File

@ -72,7 +72,7 @@ class TestSerialization(base.BaseTestCase):
self.assertSendable(data)
def test_unicode(self):
data = u'\u4e09\u9df9'
data = u'\u4e09\u9df9\udc82'
self.assertSendable(data)
def test_tuple(self):