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 2

Just check for bytes

Browse source
This commit is contained in:
twangboy 2021-03-30 10:30:07 -06:00 • committed by Gareth J. Greenaway
parent d316759729
commit bc28061706
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/_logging/impl.py
View file

@ -349,7 +349,7 @@ class SaltLoggingClass(
except NameError:
salt_system_encoding = "utf-8"
if isinstance(msg, str) and not isinstance(msg, str):
if isinstance(msg, bytes):
try:
_msg = msg.decode(salt_system_encoding, "replace")
except UnicodeDecodeError:
@ -359,7 +359,7 @@ class SaltLoggingClass(
_args = []
for item in args:
if isinstance(item, str) and not isinstance(item, str):
if isinstance(item, bytes):
try:
_args.append(item.decode(salt_system_encoding, "replace"))
except UnicodeDecodeError: