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

Merge pull request #53235 from saltstack/revert-52934-fix_msgpack

Browse source 
Revert "Update msgpack calls for newer msgpack"
This commit is contained in:
Pedro Algarvio 2019-05-24 14:35:19 +01:00 • committed by GitHub
commit 14aeeeaab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/transport/ipc.py
View file

@ -254,15 +254,11 @@ class IPCClient(object):
self.socket_path = socket_path
self._closing = False
self.stream = None
# msgpack deprecated `encoding` starting with version 0.5.2
if msgpack.version >= (0, 5, 2):
msgpack_kwargs = {'raw': False}
if six.PY2:
encoding = None
else:
if six.PY2:
msgpack_kwargs = {'encoding': None}
else:
msgpack_kwargs = {'encoding': 'utf-8'}
self.unpacker = msgpack.Unpacker(**msgpack_kwargs)
encoding = 'utf-8'
self.unpacker = msgpack.Unpacker(encoding=encoding)
def connected(self):
return self.stream is not None and not self.stream.closed()