valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix non raw msg pack msg decoding

Browse Source
This commit is contained in:
Daniel A. Wozniak 2019-04-30 01:05:46 +00:00 committed by Pedro Algarvio
parent f193f0f2ec
commit ce782ff27a
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/payload.py
View File

@ -148,7 +148,10 @@ class Serial(object):
# that under Python 2 we can still work with older versions
# of msgpack.
if msgpack.version >= (0, 5, 2):
loads_kwargs['raw'] = False
if encoding is None:
loads_kwargs['raw'] = True
else:
loads_kwargs['raw'] = False
else:
loads_kwargs['encoding'] = encoding
try: