From 1517db06c5d34d0ebca719537a06b2b90c4116b9 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 1 Aug 2017 11:35:05 +1000 Subject: [PATCH] fix to alllow the winrm plugin to send input with Python 3 (#27474) --- lib/ansible/plugins/connection/winrm.py | 4 ++-- lib/ansible/plugins/shell/powershell.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py index e73b46be46d..23f46a39f13 100644 --- a/lib/ansible/plugins/connection/winrm.py +++ b/lib/ansible/plugins/connection/winrm.py @@ -416,11 +416,11 @@ class Connection(ConnectionBase): in_size = os.path.getsize(to_bytes(in_path, errors='surrogate_or_strict')) offset = 0 with open(to_bytes(in_path, errors='surrogate_or_strict'), 'rb') as in_file: - for out_data in iter((lambda: in_file.read(buffer_size)), ''): + for out_data in iter((lambda: in_file.read(buffer_size)), b''): offset += len(out_data) self._display.vvvvv('WINRM PUT "%s" to "%s" (offset=%d size=%d)' % (in_path, out_path, offset, len(out_data)), host=self._winrm_host) # yes, we're double-encoding over the wire in this case- we want to ensure that the data shipped to the end PS pipeline is still b64-encoded - b64_data = base64.b64encode(out_data) + '\r\n' + b64_data = base64.b64encode(out_data) + b'\r\n' # cough up the data, as well as an indicator if this is the last chunk so winrm_send knows to set the End signal yield b64_data, (in_file.tell() == in_size) diff --git a/lib/ansible/plugins/shell/powershell.py b/lib/ansible/plugins/shell/powershell.py index 3eec8479d14..7dbe2e5934a 100644 --- a/lib/ansible/plugins/shell/powershell.py +++ b/lib/ansible/plugins/shell/powershell.py @@ -1379,8 +1379,8 @@ class ShellModule(object): # non-pipelining - cmd_parts = shlex.split(to_bytes(cmd), posix=False) - cmd_parts = map(to_text, cmd_parts) + cmd_parts = shlex.split(cmd, posix=False) + cmd_parts = list(map(to_text, cmd_parts)) if shebang and shebang.lower() == '#!powershell': if not self._unquote(cmd_parts[0]).lower().endswith('.ps1'): cmd_parts[0] = '"%s.ps1"' % self._unquote(cmd_parts[0]) @@ -1480,7 +1480,7 @@ class ShellModule(object): script = u'%s\r\nIf (-not $?) { If (Get-Variable LASTEXITCODE -ErrorAction SilentlyContinue) { exit $LASTEXITCODE } Else { exit 1 } }\r\n'\ % script script = '\n'.join([x.strip() for x in script.splitlines() if x.strip()]) - encoded_script = base64.b64encode(script.encode('utf-16-le')) + encoded_script = to_text(base64.b64encode(script.encode('utf-16-le')), 'utf-8') cmd_parts = _common_args + ['-EncodedCommand', encoded_script] if as_list: