From d8bdf38b50152417d3a1dd2facdb6599467b2ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Finn=C3=A9?= Date: Fri, 3 Aug 2018 15:50:14 +0200 Subject: [PATCH] Fix telnet action plugin type error (#43609) * Fix telnet action plugin type error * removed blank line too much (pep8 E303) --- lib/ansible/plugins/action/telnet.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/ansible/plugins/action/telnet.py b/lib/ansible/plugins/action/telnet.py index c0c5548fb69..201f3bb0380 100644 --- a/lib/ansible/plugins/action/telnet.py +++ b/lib/ansible/plugins/action/telnet.py @@ -8,7 +8,7 @@ __metaclass__ = type import telnetlib from time import sleep -from ansible.module_utils._text import to_native +from ansible.module_utils._text import to_native, to_bytes from ansible.module_utils.six import text_type from ansible.plugins.action import ActionBase @@ -64,26 +64,26 @@ class ActionModule(ActionBase): output = [] try: if send_newline: - tn.write('\n') + tn.write(b'\n') - tn.read_until(login_prompt) - tn.write('%s\n' % to_native(user)) + tn.read_until(to_bytes(login_prompt)) + tn.write(to_bytes(user + "\n")) if password: - tn.read_until(password_prompt) - tn.write('%s\n' % to_native(password)) + tn.read_until(to_bytes(password_prompt)) + tn.write(to_bytes(password + "\n")) - tn.expect(prompts) + tn.expect(list(map(to_bytes, prompts))) for cmd in commands: display.vvvvv('>>> %s' % cmd) - tn.write('%s\n' % to_native(cmd)) - index, match, out = tn.expect(prompts) + tn.write(to_bytes(cmd + "\n")) + index, match, out = tn.expect(list(map(to_bytes, prompts))) display.vvvvv('<<< %s' % cmd) output.append(out) sleep(pause) - tn.write("exit\n") + tn.write(b"exit\n") except EOFError as e: result['failed'] = True