From 856c1fc5f29c3588717044592c68a05aca7d3eb4 Mon Sep 17 00:00:00 2001 From: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Date: Mon, 29 Sep 2025 11:48:46 -0400 Subject: [PATCH 1/4] Update pyzowe.py Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> --- python/pyzowe/pyzowe.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/pyzowe/pyzowe.py b/python/pyzowe/pyzowe.py index 7e28339..3c7b42b 100644 --- a/python/pyzowe/pyzowe.py +++ b/python/pyzowe/pyzowe.py @@ -24,6 +24,7 @@ """ import subprocess import json +import os class ZoweCallError(Exception): @@ -82,8 +83,10 @@ def zowe(arguments: str): for job in zowe("zos-jobs list jobs"): print(f"Job {job['jobid']} has return code {job['retcode']}") """ - + old_color = os.environ['FORCE_COLOR'] + os.environ['FORCE_COLOR'] = "0" zowe_command = "zowe " + arguments + " --rfj" + os.environ['FORCE_COLOR'] = old_color try: completed_process = subprocess.run( zowe_command, shell=True, capture_output=True, check=True, encoding="utf8") From 84da242600b92f0dbc533c2d1045eb48ab141e26 Mon Sep 17 00:00:00 2001 From: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Date: Wed, 3 Dec 2025 12:25:12 -0500 Subject: [PATCH 2/4] fix: make sure FORCE_COLOR is 0 when running the command Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> --- python/pyzowe/pyzowe.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/pyzowe/pyzowe.py b/python/pyzowe/pyzowe.py index 3c7b42b..86fd57f 100644 --- a/python/pyzowe/pyzowe.py +++ b/python/pyzowe/pyzowe.py @@ -86,7 +86,7 @@ def zowe(arguments: str): old_color = os.environ['FORCE_COLOR'] os.environ['FORCE_COLOR'] = "0" zowe_command = "zowe " + arguments + " --rfj" - os.environ['FORCE_COLOR'] = old_color + try: completed_process = subprocess.run( zowe_command, shell=True, capture_output=True, check=True, encoding="utf8") @@ -95,3 +95,5 @@ def zowe(arguments: str): except subprocess.CalledProcessError as e: raise ZoweCallError(e.returncode, e.cmd, arguments, output=e.output, stderr=e.stderr) + finally: + os.environ['FORCE_COLOR'] = old_color From 038f8d78d2d122fdd9dc43bf06d5e0da4ee4447f Mon Sep 17 00:00:00 2001 From: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Date: Thu, 4 Dec 2025 09:25:30 -0500 Subject: [PATCH 3/4] review: best to past an env_copy. Thanks @t1m0thyj Co-authored-by: Timothy Johnson Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> --- python/pyzowe/pyzowe.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/python/pyzowe/pyzowe.py b/python/pyzowe/pyzowe.py index 86fd57f..79190c6 100644 --- a/python/pyzowe/pyzowe.py +++ b/python/pyzowe/pyzowe.py @@ -83,17 +83,14 @@ def zowe(arguments: str): for job in zowe("zos-jobs list jobs"): print(f"Job {job['jobid']} has return code {job['retcode']}") """ - old_color = os.environ['FORCE_COLOR'] - os.environ['FORCE_COLOR'] = "0" zowe_command = "zowe " + arguments + " --rfj" try: + temp_env = os.environ.copy() + # temp_env['FORCE_COLOR'] = "0" completed_process = subprocess.run( - zowe_command, shell=True, capture_output=True, check=True, encoding="utf8") + zowe_command, shell=True, capture_output=True, check=True, encoding="utf8", env=temp_env) parsed_output = json.loads(completed_process.stdout) return parsed_output.get("data", parsed_output) except subprocess.CalledProcessError as e: - raise ZoweCallError(e.returncode, e.cmd, arguments, - output=e.output, stderr=e.stderr) - finally: - os.environ['FORCE_COLOR'] = old_color + raise ZoweCallError(e.returncode, e.cmd, arguments, output=e.output, stderr=e.stderr) From 548a21eb8b6fb72ba26aff2e9d72d182e342abe4 Mon Sep 17 00:00:00 2001 From: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> Date: Thu, 4 Dec 2025 11:35:22 -0500 Subject: [PATCH 4/4] review: forgot to uncomment before pushing Signed-off-by: Fernando Rijo Cedeno <37381190+zFernand0@users.noreply.github.com> --- python/pyzowe/pyzowe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyzowe/pyzowe.py b/python/pyzowe/pyzowe.py index 79190c6..4e49e4b 100644 --- a/python/pyzowe/pyzowe.py +++ b/python/pyzowe/pyzowe.py @@ -87,7 +87,7 @@ def zowe(arguments: str): try: temp_env = os.environ.copy() - # temp_env['FORCE_COLOR'] = "0" + temp_env['FORCE_COLOR'] = "0" completed_process = subprocess.run( zowe_command, shell=True, capture_output=True, check=True, encoding="utf8", env=temp_env) parsed_output = json.loads(completed_process.stdout)