summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/connection/winrm.py
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2016-01-25 19:17:46 -0800
committerToshio Kuratomi <toshio@fedoraproject.org>2016-01-25 19:18:59 -0800
commitf4d68b8860678d710fc9e3ff04aa1b3736e28ab2 (patch)
tree7418aff8d97e1fc6496aa80ad8c9625adab6f732 /lib/ansible/plugins/connection/winrm.py
parentc063803a91ac9c5d54c8113eff2d2d9b32875058 (diff)
downloadansible-f4d68b8860678d710fc9e3ff04aa1b3736e28ab2.tar.gz
Transform tracebacks into unicode before printing
Fixes #14042
Diffstat (limited to 'lib/ansible/plugins/connection/winrm.py')
-rw-r--r--lib/ansible/plugins/connection/winrm.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py
index dec4878740..ef2f630f97 100644
--- a/lib/ansible/plugins/connection/winrm.py
+++ b/lib/ansible/plugins/connection/winrm.py
@@ -137,20 +137,20 @@ class Connection(ConnectionBase):
protocol.send_message('')
return protocol
except Exception as e:
- err_msg = (str(e) or repr(e)).strip()
- if re.search(r'Operation\s+?timed\s+?out', err_msg, re.I):
+ err_msg = to_unicode(e).strip()
+ if re.search(ur'Operation\s+?timed\s+?out', err_msg, re.I):
raise AnsibleError('the connection attempt timed out')
- m = re.search(r'Code\s+?(\d{3})', err_msg)
+ m = re.search(ur'Code\s+?(\d{3})', err_msg)
if m:
code = int(m.groups()[0])
if code == 401:
err_msg = 'the username/password specified for this server was incorrect'
elif code == 411:
return protocol
- errors.append('%s: %s' % (transport, err_msg))
- display.vvvvv('WINRM CONNECTION ERROR: %s\n%s' % (err_msg, traceback.format_exc()), host=self._winrm_host)
+ errors.append(u'%s: %s' % (transport, err_msg))
+ display.vvvvv(u'WINRM CONNECTION ERROR: %s\n%s' % (err_msg, to_unicode(traceback.format_exc())), host=self._winrm_host)
if errors:
- raise AnsibleError(', '.join(errors))
+ raise AnsibleError(', '.join(to_str(errors)))
else:
raise AnsibleError('No transport found for WinRM connection')