From c9b3794f0e327b30b3e3bf2b9e7393000051bf18 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 22 Oct 2019 18:43:04 -0700 Subject: [PATCH] Renamed some vars for consistency --- scripts/wk/exe.py | 4 ++-- scripts/wk/os/win.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/wk/exe.py b/scripts/wk/exe.py index 758b4ae1..9a747e4c 100644 --- a/scripts/wk/exe.py +++ b/scripts/wk/exe.py @@ -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 diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py index df341d75..f367e40f 100644 --- a/scripts/wk/os/win.py +++ b/scripts/wk/os/win.py @@ -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