Fix urlparse import for Python3 (#31240)

* Fix urlparse import for Python3 in

* contrib/inventory/consul_io.py
* contrib/inventory/rudder.py
* contrib/inventory/windows_azure.py
* lib/ansible/module_utils/known_hosts.py
* lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
* lib/ansible/modules/cloud/docker/_docker.py
* lib/ansible/modules/cloud/ovirt/ovirt_disk.py
* lib/ansible/plugins/action/ce_template.py
This commit is contained in:
François Scala
2017-10-10 05:18:09 +02:00
committed by Toshio Kuratomi
parent 2b2e3e688f
commit aade5234a9
9 changed files with 13 additions and 31 deletions

View File

@@ -166,7 +166,7 @@ firewall_policy:
__version__ = '${version}'
import os
import urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
from time import sleep
from distutils.version import LooseVersion
@@ -288,7 +288,7 @@ class ClcFirewallPolicy:
:return: policy_id: firewall policy id from creation call
"""
url = response.get('links')[0]['href']
path = urlparse.urlparse(url).path
path = urlparse(url).path
path_list = os.path.split(path)
policy_id = path_list[-1]
return policy_id

View File

@@ -516,11 +516,7 @@ EXAMPLES = '''
import json
import os
import shlex
try:
from urlparse import urlparse
except ImportError:
# python3
from urllib.parse import urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
try:
import docker.client

View File

@@ -236,11 +236,7 @@ import ssl
from httplib import HTTPSConnection
from httplib import IncompleteRead
try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
try:
import ovirtsdk4.types as otypes