From 281549cadc430ce6cfde405a1441e685d3f0811b Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Mon, 20 Apr 2020 07:05:57 -0400 Subject: [PATCH] jira: Fix incompatible pathname2url import (#204) (#205) The call to pathname2url was broken in Python 2. Fix it by importing from module_utils.six instead of importing urllib and calling it from there. --- plugins/modules/web_infrastructure/jira.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/modules/web_infrastructure/jira.py b/plugins/modules/web_infrastructure/jira.py index 66c30cb0b5..295bf692fa 100644 --- a/plugins/modules/web_infrastructure/jira.py +++ b/plugins/modules/web_infrastructure/jira.py @@ -286,7 +286,9 @@ EXAMPLES = """ import base64 import json import sys -import urllib + +from ansible.module_utils.six.moves.urllib.request import pathname2url + from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils.basic import AnsibleModule @@ -401,10 +403,10 @@ def fetch(restbase, user, passwd, params): def search(restbase, user, passwd, params): - url = restbase + '/search?jql=' + urllib.request.pathname2url(params['jql']) + url = restbase + '/search?jql=' + pathname2url(params['jql']) if params['fields']: fields = params['fields'].keys() - url = url + '&fields=' + '&fields='.join([urllib.request.pathname2url(f) for f in fields]) + url = url + '&fields=' + '&fields='.join([pathname2url(f) for f in fields]) if params['maxresults']: url = url + '&maxResults=' + str(params['maxresults']) ret = get(url, user, passwd, params['timeout'])