Renamed some vars for consistency

This commit is contained in:
2Shirt 2019-10-22 18:43:04 -07:00
parent 2b5254dd0c
commit c9b3794f0e
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 4 additions and 4 deletions

View file

@ -102,8 +102,8 @@ def get_json_from_command(cmd, check=True, encoding='utf-8', errors='ignore'):
json_data = {}
try:
result = run_program(cmd, check=check, encoding=encoding, errors=errors)
json_data = json.loads(result.stdout)
proc = run_program(cmd, check=check, encoding=encoding, errors=errors)
json_data = json.loads(proc.stdout)
except (subprocess.CalledProcessError, json.decoder.JSONDecodeError):
if errors != 'ignore':
raise

View file

@ -93,8 +93,8 @@ def enable_safemode_msi():
def get_activation_string():
"""Get activation status, returns str."""
cmd = ['cscript', '//nologo', SLMGR, '/xpr']
result = run_program(cmd, check=False)
act_str = result.stdout
proc = run_program(cmd, check=False)
act_str = proc.stdout
act_str = act_str.splitlines()[1]
act_str = act_str.strip()
return act_str