From 69a203e9d45cbce5c256c2bfe9238255a7227c7e Mon Sep 17 00:00:00 2001 From: Daniel Holanda Date: Wed, 3 Apr 2024 07:05:55 -0800 Subject: [PATCH] specify how errors should be handled during decoding (#148) --- src/turnkeyml/run/plugin_helpers.py | 12 ++++++++---- src/turnkeyml/version.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/turnkeyml/run/plugin_helpers.py b/src/turnkeyml/run/plugin_helpers.py index 1dbf41f0..94c131ac 100644 --- a/src/turnkeyml/run/plugin_helpers.py +++ b/src/turnkeyml/run/plugin_helpers.py @@ -110,15 +110,19 @@ def logged_subprocess( cwd=cwd, ) except Exception as e: # pylint: disable=broad-except - log_stdout = e.stdout.decode("utf-8") # pylint: disable=no-member - log_stderr = e.stderr.decode("utf-8") # pylint: disable=no-member + log_stdout = e.stdout.decode( # pylint: disable=no-member + "utf-8", errors="replace" + ) + log_stderr = e.stderr.decode( # pylint: disable=no-member + "utf-8", errors="replace" + ) raise CondaError( f"Exception {e} encountered, \n\nstdout was: " f"\n{log_stdout}\n\n and stderr was: \n{log_stderr}" ) else: - log_stdout = proc.stdout.decode("utf-8") - log_stderr = proc.stderr.decode("utf-8") + log_stdout = proc.stdout.decode("utf-8", errors="replace") + log_stderr = proc.stderr.decode("utf-8", errors="replace") finally: if log_to_std_streams: # Print log to stdout diff --git a/src/turnkeyml/version.py b/src/turnkeyml/version.py index 0309ae29..5fa9130a 100644 --- a/src/turnkeyml/version.py +++ b/src/turnkeyml/version.py @@ -1 +1 @@ -__version__ = "2.0.2" +__version__ = "2.0.3"