afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: updated utils.cmd to use returncode instead of wait(), removed redundant default encoding value for calls to decode/encode

Browse source
This commit is contained in:
Blake Harnden 2023-06-08 14:34:24 -07:00
parent 94f070e0ff
commit 81230edac3
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/utils.py
View file

@ -87,7 +87,7 @@ def hashkey(value: Union[str, int]) -> int:
"""
if isinstance(value, int):
value = str(value)
value = value.encode("utf-8")
value = value.encode()
return int(hashlib.sha256(value).hexdigest(), 16)
@ -224,9 +224,9 @@ def cmd(
p = Popen(args, stdout=output, stderr=output, env=env, cwd=cwd, shell=shell)
if wait:
stdout, stderr = p.communicate()
stdout = stdout.decode("utf-8").strip()
stderr = stderr.decode("utf-8").strip()
status = p.wait()
stdout = stdout.decode().strip()
stderr = stderr.decode().strip()
status = p.returncode
if status != 0:
raise CoreCommandError(status, input_args, stdout, stderr)
return stdout