internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +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

4
lib/ansible/modules/monitoring/airbrake_deployment.py
View File

@@ -77,7 +77,7 @@ EXAMPLES = '''
revision: '4.2'
'''
import urllib
from ansible.module_utils.six.moves.urllib.parse import urlencode
# ===========================================
# Module execution.
@@ -122,7 +122,7 @@ def main():
module.exit_json(changed=True)
# Send the data to airbrake
data = urllib.urlencode(params)
data = urlencode(params)
response, info = fetch_url(module, url, data=data)
if info['status'] == 200:
module.exit_json(changed=True)

6
lib/ansible/modules/monitoring/honeybadger_deployment.py
View File

@@ -82,11 +82,10 @@ EXAMPLES = '''
RETURN = '''# '''
import urllib
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.six.moves.urllib.parse import urlencode
from ansible.module_utils.urls import *
# ===========================================
@@ -131,7 +130,7 @@ def main():
module.exit_json(changed=True)
try:
data = urllib.urlencode(params)
data = urlencode(params)
response, info = fetch_url(module, url, data=data)
except Exception:
e = get_exception()
@@ -144,4 +143,3 @@ def main():
if __name__ == '__main__':
main()

11
lib/ansible/modules/monitoring/logicmonitor.py
View File

@@ -530,7 +530,8 @@ import platform
import socket
import sys
import types
import urllib
from ansible.module_utils.six.moves.urllib.parse import urlencode
HAS_LIB_JSON = True
try:
@@ -575,8 +576,8 @@ class LogicMonitor(object):
and return the response"""
self.module.debug("Running LogicMonitor.rpc")
param_str = urllib.urlencode(params)
creds = urllib.urlencode(
param_str = urlencode(params)
creds = urlencode(
{"c": self.company,
"u": self.user,
"p": self.password})
@@ -614,8 +615,8 @@ class LogicMonitor(object):
server \"do\" function"""
self.module.debug("Running LogicMonitor.do...")
param_str = urllib.urlencode(params)
creds = (urllib.urlencode(
param_str = urlencode(params)
creds = (urlencode(
{"c": self.company,
"u": self.user,
"p": self.password}))

7
lib/ansible/modules/monitoring/logicmonitor_facts.py
View File

@@ -135,7 +135,8 @@ RETURN = '''
import socket
import types
import urllib
from ansible.module_utils.six.moves.urllib.parse import urlencode
HAS_LIB_JSON = True
try:
@@ -179,8 +180,8 @@ class LogicMonitor(object):
and return the response"""
self.module.debug("Running LogicMonitor.rpc")
param_str = urllib.urlencode(params)
creds = urllib.urlencode(
param_str = urlencode(params)
creds = urlencode(
{"c": self.company,
"u": self.user,
"p": self.password})

4
lib/ansible/modules/monitoring/newrelic_deployment.py
View File

@@ -88,7 +88,7 @@ EXAMPLES = '''
revision: '1.0'
'''
import urllib
from ansible.module_utils.six.moves.urllib.parse import urlencode
# ===========================================
# Module execution.
@@ -135,7 +135,7 @@ def main():
# Send the data to NewRelic
url = "https://rpm.newrelic.com/deployments.xml"
data = urllib.urlencode(params)
data = urlencode(params)
headers = {
'x-api-key': module.params["token"],
}

5
lib/ansible/modules/monitoring/rollbar_deployment.py
View File

@@ -82,10 +82,9 @@ EXAMPLES = '''
comment: Test Deploy
'''
import urllib
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 fetch_url
@@ -129,7 +128,7 @@ def main():
url = module.params.get('url')
try:
data = urllib.urlencode(params)
data = urlencode(params)
response, info = fetch_url(module, url, data=data)
except Exception:
e = get_exception()

9
lib/ansible/modules/monitoring/uptimerobot.py
View File

@@ -79,9 +79,10 @@ except ImportError:
# Let snippet from module_utils/basic.py return a proper error in this case
pass
import urllib
import time
from ansible.module_utils.six.moves.urllib.parse import urlencode
API_BASE = "http://api.uptimerobot.com/"
API_ACTIONS = dict(
@@ -97,7 +98,7 @@ SUPPORTS_CHECK_MODE = False
def checkID(module, params):
data = urllib.urlencode(params)
data = urlencode(params)
full_uri = API_BASE + API_ACTIONS['status'] + data
req, info = fetch_url(module, full_uri)
result = req.read()
@@ -109,7 +110,7 @@ def checkID(module, params):
def startMonitor(module, params):
params['monitorStatus'] = 1
data = urllib.urlencode(params)
data = urlencode(params)
full_uri = API_BASE + API_ACTIONS['editMonitor'] + data
req, info = fetch_url(module, full_uri)
result = req.read()
@@ -121,7 +122,7 @@ def startMonitor(module, params):
def pauseMonitor(module, params):
params['monitorStatus'] = 0
data = urllib.urlencode(params)
data = urlencode(params)
full_uri = API_BASE + API_ACTIONS['editMonitor'] + data
req, info = fetch_url(module, full_uri)
result = req.read()