summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzaiusdr <eduardosuarez@gmail.com>2016-11-10 16:55:58 +0100
committerToshio Kuratomi <a.badger@gmail.com>2016-11-18 12:45:07 -0800
commit7ed1af0a6d3f5e852a21aeb0b310ec71fddb2b28 (patch)
tree90322196aa7ae408d87c9a4526616991141064fd
parent514a2d40c179cc51d58972c02fe723d6b57d3b40 (diff)
downloadansible-modules-core-7ed1af0a6d3f5e852a21aeb0b310ec71fddb2b28.tar.gz
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.
-rw-r--r--utilities/logic/wait_for.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/utilities/logic/wait_for.py b/utilities/logic/wait_for.py
index 2cd99c24..46be2ff0 100644
--- a/utilities/logic/wait_for.py
+++ b/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