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

Fixed import of urlencode and pathname2url from urllib for python3 (#24424)

Browse Source
This commit is contained in:
Michael
2017-05-19 17:22:16 +00:00
committed by Matt Martz
parent 98a8b967d2
commit b65ebf3519
26 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/modules/cloud/cloudscale/cloudscale_server.py
View File

@@ -225,9 +225,9 @@ from datetime import datetime, timedelta
import json
import os
from time import sleep
from urllib import urlencode
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six.moves.urllib.parse import urlencode
from ansible.module_utils.urls import fetch_url
API_URL = 'https://api.cloudscale.ch/v1/'

4
lib/ansible/modules/cloud/vmware/vsphere_copy.py
View File

@@ -96,13 +96,13 @@ EXAMPLES = '''
'''
import atexit
import urllib
import mmap
import errno
import socket
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.six.moves.urllib.parse import urlencode
from ansible.module_utils.urls import open_url
def vmware_path(datastore, datacenter, path):
@@ -116,7 +116,7 @@ def vmware_path(datastore, datacenter, path):
params = dict( dsName = datastore )
if datacenter:
params["dcPath"] = datacenter
params = urllib.urlencode(params)
params = urlencode(params)
return "%s?%s" % (path, params)
def main():