From ba5e6f89f330343f53eb5d47f7bf8985031105f4 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 14 Mar 2022 21:01:35 +0100 Subject: [PATCH] Fix warning/error extraction. (#305) --- changelogs/fragments/305-docker_compose-errors-warnings.yml | 2 ++ plugins/modules/docker_compose.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/305-docker_compose-errors-warnings.yml diff --git a/changelogs/fragments/305-docker_compose-errors-warnings.yml b/changelogs/fragments/305-docker_compose-errors-warnings.yml new file mode 100644 index 00000000..0ee0352e --- /dev/null +++ b/changelogs/fragments/305-docker_compose-errors-warnings.yml @@ -0,0 +1,2 @@ +bugfixes: + - "docker_compose - fix Python 3 type error when extracting warnings or errors from docker-compose's output (https://github.com/ansible-collections/community.docker/pull/305)." diff --git a/plugins/modules/docker_compose.py b/plugins/modules/docker_compose.py index 2f692609..e34beeb6 100644 --- a/plugins/modules/docker_compose.py +++ b/plugins/modules/docker_compose.py @@ -587,8 +587,8 @@ def attempt_extract_errors(exc_str, stdout, stderr): msg = 'unknown cause' return { - 'warnings': [w.encode('utf-8') for w in warnings], - 'errors': [e.encode('utf-8') for e in errors], + 'warnings': [to_native(w) for w in warnings], + 'errors': [to_native(e) for e in errors], 'msg': msg, 'module_stderr': ''.join(stderr), 'module_stdout': ''.join(stdout)