From 74b32d9ec0e9b5ef40cd7d2ddf8d77b99d612a43 Mon Sep 17 00:00:00 2001 From: zaiusdr Date: Thu, 10 Nov 2016 16:55:58 +0100 Subject: [PATCH] Fix wait_for Module to handle socket response as string in Python3 In Python3 socket module returns responses as bytes type. So it's necessary to convert it to string for the module work correctly. --- lib/ansible/modules/utilities/logic/wait_for.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/utilities/logic/wait_for.py b/lib/ansible/modules/utilities/logic/wait_for.py index 2cd99c24a1..46be2ff04c 100644 --- a/lib/ansible/modules/utilities/logic/wait_for.py +++ b/lib/ansible/modules/utilities/logic/wait_for.py @@ -27,6 +27,8 @@ import socket import sys import time +from ansible.module_utils._text import to_native + HAS_PSUTIL = False try: import psutil @@ -509,7 +511,7 @@ def main(): if not response: # Server shutdown break - data += response + data += to_native(response, errors='surrogate_or_strict') if re.search(compiled_search_re, data): matched = True break