cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix telnet action plugin type error (#43609)

Browse source 
* Fix telnet action plugin type error

* removed blank line too much (pep8 E303)
This commit is contained in:
Nicolas Finné 2018-08-03 15:50:14 +02:00 committed by Brian Coca
parent 4a1d37a76b
commit d8bdf38b50
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/plugins/action/telnet.py
View file

@ -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