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.
pull/4420/head
zaiusdr 2016-11-10 16:55:58 +01:00 committed by Matt Clay
parent 4e95ee036e
commit 74b32d9ec0
1 changed files with 3 additions and 1 deletions

View File

@ -27,6 +27,8 @@ import socket
import sys import sys
import time import time
from ansible.module_utils._text import to_native
HAS_PSUTIL = False HAS_PSUTIL = False
try: try:
import psutil import psutil
@ -509,7 +511,7 @@ def main():
if not response: if not response:
# Server shutdown # Server shutdown
break break
data += response data += to_native(response, errors='surrogate_or_strict')
if re.search(compiled_search_re, data): if re.search(compiled_search_re, data):
matched = True matched = True
break break