internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix urlparse import for Python3 (#31240)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/inventory/consul_io.py
View File

@@ -473,10 +473,7 @@ class ConsulConfig(dict):
scheme = 'http'
if hasattr(self, 'url'):
try:
from urlparse import urlparse
except ImportError:
from urllib.parse import urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
o = urlparse(self.url)
if o.hostname:
host = o.hostname

8
contrib/inventory/rudder.py
View File

@@ -56,12 +56,8 @@ import argparse
import six
import httplib2 as http
from time import time
from six.moves import configparser
try:
from urlparse import urlparse
except ImportError:
from urllib.parse import urlparse
from ansible.module_utils.six.moves import configparser
from ansible.module_utils.six.moves.urllib.parse import urlparse
try:
import json

2
contrib/inventory/windows_azure.py
View File

@@ -39,7 +39,7 @@ import re
import sys
import argparse
import os
from urlparse import urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
from time import time
try:
import json