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

Fix underscore wart (and linter)

Browse Source
This commit is contained in:
Daniel Wozniak 2019-04-27 13:42:34 -07:00 committed by Pedro Algarvio
parent 74b8f5f8aa
commit a814fc071d
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/payload.py
View File

@ -147,12 +147,11 @@ class Serial(object):
# Due to this, if we don't need it, don't pass it at all so
# that under Python 2 we can still work with older versions
# of msgpack.
if msgpack_version >= (0, 5, 2):
if msgpack.version >= (0, 5, 2):
if encoding is None:
loads_kwargs['raw'] = True
else:
loads_kwargs['raw'] = False
loads_kwargs['raw'] = False
else:
loads_kwargs['encoding'] = encoding
try: