2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Renamed some vars for consistency

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/wk/exe.py
View file

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

4
scripts/wk/os/win.py
View file

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