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

Restore python3 compat fix and fix AnsibleError undefined before use

Browse source
This commit is contained in:
Toshio Kuratomi 2015-09-17 07:44:26 -07:00
parent c881b1acae
commit 4ae5512fb0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/connection/winrm.py
View file

@ -24,8 +24,10 @@ import os
import re import re
import shlex import shlex
import traceback import traceback
import urlparse
from six.moves.urllib.parse import urlunsplit
from ansible.errors import AnsibleError
try: try:
from winrm import Response from winrm import Response
from winrm.exceptions import WinRMTransportError from winrm.exceptions import WinRMTransportError
@ -41,7 +43,7 @@ except ImportError:
pass pass
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.errors import AnsibleConnectionFailure, AnsibleFileNotFound
from ansible.plugins.connection import ConnectionBase from ansible.plugins.connection import ConnectionBase
from ansible.plugins import shell_loader from ansible.plugins import shell_loader
from ansible.utils.path import makedirs_safe from ansible.utils.path import makedirs_safe
@ -111,7 +113,7 @@ class Connection(ConnectionBase):
self._display.vvv("ESTABLISH WINRM CONNECTION FOR USER: %s on PORT %s TO %s" % \ self._display.vvv("ESTABLISH WINRM CONNECTION FOR USER: %s on PORT %s TO %s" % \
(self._winrm_user, self._winrm_port, self._winrm_host), host=self._winrm_host) (self._winrm_user, self._winrm_port, self._winrm_host), host=self._winrm_host)
netloc = '%s:%d' % (self._winrm_host, self._winrm_port) netloc = '%s:%d' % (self._winrm_host, self._winrm_port)
endpoint = urlparse.urlunsplit((self._winrm_scheme, netloc, self._winrm_path, '', '')) endpoint = urlunsplit((self._winrm_scheme, netloc, self._winrm_path, '', ''))
errors = [] errors = []
for transport in self._winrm_transport: for transport in self._winrm_transport:
if transport == 'kerberos' and not HAVE_KERBEROS: if transport == 'kerberos' and not HAVE_KERBEROS: