Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-10-31 10:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forward compat for future msgpack changes

Browse Source
This commit is contained in:
Kovid Goyal 2018-09-10 17:06:59 +05:30
parent ce377076b9
commit cedf06b55d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/test_build.py
View File

@ -111,6 +111,8 @@ class BuildTest(unittest.TestCase):
for obj in ({1:1}, utcnow()): for obj in ({1:1}, utcnow()):
s = msgpack_dumps(obj) s = msgpack_dumps(obj)
self.assertEqual(obj, msgpack_loads(s)) self.assertEqual(obj, msgpack_loads(s))
self.assertEqual(type(msgpack_loads(msgpack_dumps(b'b'))), bytes)
self.assertEqual(type(msgpack_loads(msgpack_dumps(u'b'))), type(u''))
@unittest.skipUnless(isosx, 'FSEvents only present on OS X') @unittest.skipUnless(isosx, 'FSEvents only present on OS X')
def test_fsevents(self): def test_fsevents(self):

2
src/calibre/utils/serialize.py
View File

@ -92,7 +92,7 @@ def msgpack_decoder(code, data):
return decoders[code](msgpack_loads(data), False) return decoders[code](msgpack_loads(data), False)
msgpack_loads = partial(msgpack.unpackb, encoding='utf-8', ext_hook=msgpack_decoder) msgpack_loads = partial(msgpack.unpackb, encoding='utf-8', ext_hook=msgpack_decoder, raw=False)
def json_loads(data): def json_loads(data):