Fix warning/error extraction. (#305)

(cherry picked from commit ba5e6f8)
ansible-collections · Mar 14, 2022 · 1b0d2af · 1b0d2af
1 parent fbecb24
commit 1b0d2af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelogs/fragments/305-docker_compose-errors-warnings.yml 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
@@ -586,8 +586,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)
Original file line number	Diff line number	Diff line change
		@@ -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)."