saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bump msgpack minimum version

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-07-25 12:55:03 -07:00 • committed by Gareth J. Greenaway
parent dadacf2685
commit a951a88576
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/base.txt
View file

@ -1,6 +1,6 @@
Jinja2
jmespath
msgpack>=0.5,!=0.5.5
msgpack>=0.5.2,!=0.5.5
PyYAML
MarkupSafe
requests>=1.0.0

8
salt/transport/tcp.py
View file

@ -1262,13 +1262,7 @@ class TCPPuller:
else:
return _null
# msgpack deprecated `encoding` starting with version 0.5.2
if salt.utils.msgpack.version >= (0, 5, 2):
# Under Py2 we still want raw to be set to True
msgpack_kwargs = {"raw": False}
else:
msgpack_kwargs = {"encoding": "utf-8"}
unpacker = salt.utils.msgpack.Unpacker(**msgpack_kwargs)
unpacker = salt.utils.msgpack.Unpacker(raw=False)
while not stream.closed():
try:
wire_bytes = await stream.read_bytes(4096, partial=True)

4
salt/utils/msgpack.py
View file

@ -61,10 +61,6 @@ def _sanitize_msgpack_kwargs(kwargs):
assert isinstance(kwargs, dict)
if version < (0, 6, 0) and kwargs.pop("strict_map_key", None) is not None:
log.info("removing unsupported `strict_map_key` argument from msgpack call")
if version < (0, 5, 2) and kwargs.pop("raw", None) is not None:
log.info("removing unsupported `raw` argument from msgpack call")
if version < (0, 4, 0) and kwargs.pop("use_bin_type", None) is not None:
log.info("removing unsupported `use_bin_type` argument from msgpack call")
if version >= (1, 0, 0) and kwargs.pop("encoding", None) is not None:
log.debug("removing unsupported `encoding` argument from msgpack call")