From 2c826eba2d3aaaeaba397de9f90ce42e1decef07 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 19 Feb 2020 16:48:14 +0100 Subject: [PATCH] Rev4447, Fix Msgpack 1.0.0 compatibility --- src/Config.py | 2 +- src/util/Msgpack.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index eddfefb2..caac7f2d 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.7.1" - self.rev = 4445 + self.rev = 4447 self.argv = argv self.action = None self.test_parser = None diff --git a/src/util/Msgpack.py b/src/util/Msgpack.py index f87b95b0..1033f92e 100644 --- a/src/util/Msgpack.py +++ b/src/util/Msgpack.py @@ -78,10 +78,14 @@ def getUnpacker(fallback=False, decode=True): else: 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 - 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: - unpacker = unpacker(raw=False, max_buffer_size=5 * 1024 * 1024) + unpacker = unpacker(raw=False, **extra_kwargs) return unpacker