ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix paramiko's exec_command() to return bytes on python3 (#17372)

Browse source 
* Fix paramiko's exec_command() to return bytes on python3

* Run test_connection for python3 now too

* Fix atomic_move for problem in shippable's testing

* Python-2.4 needs to use b()
This commit is contained in:
Toshio Kuratomi 2016-09-02 20:32:14 -07:00 committed by GitHub
parent 3b2830818e
commit f7b22a5eaa
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/basic.py
View file

@ -1947,12 +1947,12 @@ class AnsibleModule(object):
self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e)) self.fail_json(msg='Could not replace file: %s to %s: %s' % (src, dest, e))
else: else:
b_dest_dir = os.path.dirname(b_dest) b_dest_dir = os.path.dirname(b_dest)
# Converting from bytes so that if py3, it will be # Use bytes here. In the shippable CI, this fails with
# surrogateescaped. If py2, it wil be a noop. Converting # a UnicodeError with surrogateescape'd strings for an unknown
# from text strings could mangle filenames on py2) # reason (doesn't happen in a local Ubuntu16.04 VM)
native_dest_dir = to_native(b_dest_dir) native_dest_dir = b_dest_dir
native_suffix = to_native(os.path.basename(b_dest)) native_suffix = os.path.basename(b_dest)
native_prefix = '.ansible_tmp' native_prefix = b('.ansible_tmp')
try: try:
tmp_dest_fd, tmp_dest_name = tempfile.mkstemp( tmp_dest_fd, tmp_dest_name = tempfile.mkstemp(
prefix=native_prefix, dir=native_dest_dir, suffix=native_suffix) prefix=native_prefix, dir=native_dest_dir, suffix=native_suffix)

13
lib/ansible/plugins/connection/paramiko_ssh.py
View file

@ -40,6 +40,7 @@ from binascii import hexlify
from ansible.compat.six import iteritems from ansible.compat.six import iteritems
from ansible import constants as C from ansible import constants as C
from ansible.compat.six.moves import input
from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
from ansible.plugins.connection import ConnectionBase from ansible.plugins.connection import ConnectionBase
from ansible.utils.path import makedirs_safe from ansible.utils.path import makedirs_safe
@ -100,7 +101,7 @@ class MyAddPolicy(object):
fingerprint = hexlify(key.get_fingerprint()) fingerprint = hexlify(key.get_fingerprint())
ktype = key.get_name() ktype = key.get_name()
inp = raw_input(AUTHENTICITY_MSG % (hostname, ktype, fingerprint)) inp = input(AUTHENTICITY_MSG % (hostname, ktype, fingerprint))
sys.stdin = old_stdin sys.stdin = old_stdin
self.connection.connection_unlock() self.connection.connection_unlock()
@ -274,9 +275,9 @@ class Connection(ConnectionBase):
cmd = to_bytes(cmd, errors='strict') cmd = to_bytes(cmd, errors='strict')
no_prompt_out = '' no_prompt_out = b''
no_prompt_err = '' no_prompt_err = b''
become_output = '' become_output = b''
try: try:
chan.exec_command(cmd) chan.exec_command(cmd)
@ -317,8 +318,8 @@ class Connection(ConnectionBase):
except socket.timeout: except socket.timeout:
raise AnsibleError('ssh timed out waiting for privilege escalation.\n' + become_output) raise AnsibleError('ssh timed out waiting for privilege escalation.\n' + become_output)
stdout = ''.join(chan.makefile('rb', bufsize)) stdout = b''.join(chan.makefile('rb', bufsize))
stderr = ''.join(chan.makefile_stderr('rb', bufsize)) stderr = b''.join(chan.makefile_stderr('rb', bufsize))
return (chan.recv_exit_status(), no_prompt_out + stdout, no_prompt_out + stderr) return (chan.recv_exit_status(), no_prompt_out + stdout, no_prompt_out + stderr)

1
test/utils/shippable/python3-test-target-blacklist.txt
View file

@ -2,4 +2,3 @@ s/ pull / /
s/ no_log / / s/ no_log / /
s/ test_async_conditional / / s/ test_async_conditional / /
s/ test_binary_modules$/ / s/ test_binary_modules$/ /
s/ test_connection / /