saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make sure obj is dict

Browse source
This commit is contained in:
Jamie (Bear) Murphy 2022-09-30 16:41:13 +01:00
parent afa04f564a
commit 88087847e2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/jid.py
View file

@ -137,7 +137,11 @@ def return_obj_string_safe(response, to_encoding="utf-8"):
return_obj_string_safe
encoding type to use, defaulted to "utf-8"
"""
if "return" in response.keys() and "return" in response["return"].keys():
if (
isinstance(response, dict)
and "return" in response.keys()
and "return" in response["return"].keys()
):
if isinstance(response["return"]["return"], (bytes, bytearray)):
response["return"]["return"] = response["return"]["return"].decode(
to_encoding, "strict"