Fix undefined variables, basestring usage, and some associated python3 issues

This commit is contained in:
Toshio Kuratomi 2017-07-22 18:15:46 -07:00
commit 225fa5d092
84 changed files with 652 additions and 963 deletions

View file

@ -24,7 +24,7 @@ except ImportError:
from ansible.module_utils.six.moves.urllib.error import HTTPError
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.api import basic_auth_argument_spec
from ansible.module_utils.urls import open_url
from ansible.module_utils.api import basic_auth_argument_spec
@ -145,8 +145,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
force=force, last_mod_time=last_mod_time, timeout=timeout, validate_certs=validate_certs,
url_username=url_username, url_password=url_password, http_agent=http_agent,
force_basic_auth=force_basic_auth)
except HTTPError:
err = get_exception()
except HTTPError as err:
r = err.fp
try: