oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev4447, Fix Msgpack 1.0.0 compatibility

Browse source
This commit is contained in:
shortcutme 2020-02-19 16:48:14 +01:00
parent 64e5e0c80e
commit 2c826eba2d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.7.1" self.version = "0.7.1"
self.rev = 4445 self.rev = 4447
self.argv = argv self.argv = argv
self.action = None self.action = None
self.test_parser = None self.test_parser = None

8
src/util/Msgpack.py
View file

@ -78,10 +78,14 @@ def getUnpacker(fallback=False, decode=True):
else: else:
unpacker = msgpack.Unpacker unpacker = msgpack.Unpacker
extra_kwargs = {"max_buffer_size": 5 * 1024 * 1024}
if msgpack.version[0] >= 1:
extra_kwargs["strict_map_key"] = False
if decode: # Workaround for backward compatibility: Try to decode bin to str if decode: # Workaround for backward compatibility: Try to decode bin to str
unpacker = unpacker(raw=True, object_pairs_hook=objectDecoderHook, max_buffer_size=5 * 1024 * 1024) unpacker = unpacker(raw=True, object_pairs_hook=objectDecoderHook, **extra_kwargs)
else: else:
unpacker = unpacker(raw=False, max_buffer_size=5 * 1024 * 1024) unpacker = unpacker(raw=False, **extra_kwargs)
return unpacker return unpacker