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

Fix ssh connection plugin to work with python3

Browse source
This commit is contained in:
Toshio Kuratomi 2016-03-09 11:17:10 -08:00
parent 2b8a0cdddc
commit c0e2dd1693
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/connection/ssh.py
View file

@ -323,7 +323,7 @@ class Connection(ConnectionBase):
if isinstance(cmd, (text_type, binary_type)): if isinstance(cmd, (text_type, binary_type)):
cmd = to_bytes(cmd) cmd = to_bytes(cmd)
else: else:
cmd = map(to_bytes, cmd) cmd = list(map(to_bytes, cmd))
if not in_data: if not in_data:
try: try:
@ -585,7 +585,7 @@ class Connection(ConnectionBase):
remaining_tries = int(C.ANSIBLE_SSH_RETRIES) + 1 remaining_tries = int(C.ANSIBLE_SSH_RETRIES) + 1
cmd_summary = "%s..." % args[0] cmd_summary = "%s..." % args[0]
for attempt in xrange(remaining_tries): for attempt in range(remaining_tries):
try: try:
return_tuple = self._exec_command(*args, **kwargs) return_tuple = self._exec_command(*args, **kwargs)
# 0 = success # 0 = success