Under Py2 we still want raw to be set to True

saltstack · May 27, 2019 · 0ae2ef0 · 0ae2ef0
1 parent 714d663
commit 0ae2ef0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py
@@ -166,7 +166,8 @@ def return_message(msg):
                 return _null
         # msgpack deprecated `encoding` starting with version 0.5.2
         if msgpack.version >= (0, 5, 2):
-            msgpack_kwargs = {'raw': False}
+            # Under Py2 we still want raw to be set to True
+            msgpack_kwargs = {'raw': six.PY2}
         else:
             if six.PY2:
                 msgpack_kwargs = {'encoding': None}
@@ -260,7 +261,8 @@ def __init__(self, socket_path, io_loop=None):
         self.stream = None
         # msgpack deprecated `encoding` starting with version 0.5.2
         if msgpack.version >= (0, 5, 2):
-            msgpack_kwargs = {'raw': False}
+            # Under Py2 we still want raw to be set to True
+            msgpack_kwargs = {'raw': six.PY2}
         else:
             if six.PY2:
                 msgpack_kwargs = {'encoding': None}