diff --git a/lib/ansible/modules/web_infrastructure/jira.py b/lib/ansible/modules/web_infrastructure/jira.py index ca2b7bb4642..025d376dba2 100644 --- a/lib/ansible/modules/web_infrastructure/jira.py +++ b/lib/ansible/modules/web_infrastructure/jira.py @@ -247,6 +247,7 @@ from ansible.module_utils.basic import * from ansible.module_utils.urls import * from ansible.module_utils.pycompat24 import get_exception + def request(url, user, passwd, timeout, data=None, method=None): if data: data = json.dumps(data) @@ -260,8 +261,8 @@ def request(url, user, passwd, timeout, data=None, method=None): # the requests as authorized for this user. auth = base64.encodestring('%s:%s' % (user, passwd)).replace('\n', '') response, info = fetch_url(module, url, data=data, method=method, timeout=timeout, - headers={'Content-Type':'application/json', - 'Authorization':"Basic %s" % auth}) + headers={'Content-Type': 'application/json', + 'Authorization': "Basic %s" % auth}) if info['status'] not in (200, 201, 204): module.fail_json(msg=info['msg']) @@ -273,22 +274,25 @@ def request(url, user, passwd, timeout, data=None, method=None): else: return {} + def post(url, user, passwd, timeout, data): return request(url, user, passwd, timeout, data=data, method='POST') + def put(url, user, passwd, timeout, data): return request(url, user, passwd, timeout, data=data, method='PUT') + def get(url, user, passwd, timeout): return request(url, user, passwd, timeout) def create(restbase, user, passwd, params): createfields = { - 'project': { 'key': params['project'] }, + 'project': {'key': params['project']}, 'summary': params['summary'], 'description': params['description'], - 'issuetype': { 'name': params['issuetype'] }} + 'issuetype': {'name': params['issuetype']}} # Merge in any additional or overridden fields if params['fields']: @@ -306,7 +310,7 @@ def create(restbase, user, passwd, params): def comment(restbase, user, passwd, params): data = { 'body': params['comment'] - } + } url = restbase + '/issue/' + params['issue'] + '/comment' @@ -318,11 +322,11 @@ def comment(restbase, user, passwd, params): def edit(restbase, user, passwd, params): data = { 'fields': params['fields'] - } + } url = restbase + '/issue/' + params['issue'] - ret = put(url, user, passwd, params['timeout'],data) + ret = put(url, user, passwd, params['timeout'], data) return ret @@ -350,18 +354,19 @@ def transition(restbase, user, passwd, params): # Perform it url = restbase + '/issue/' + params['issue'] + "/transitions" - data = { 'transition': { "id" : tid }, - 'fields': params['fields']} + data = {'transition': {"id": tid}, + 'fields': params['fields']} ret = post(url, user, passwd, params['timeout'], data) return ret + def link(restbase, user, passwd, params): data = { - 'type': { 'name': params['linktype'] }, - 'inwardIssue': { 'key': params['inwardissue'] }, - 'outwardIssue': { 'key': params['outwardissue'] }, + 'type': {'name': params['linktype']}, + 'inwardIssue': {'key': params['inwardissue']}, + 'outwardIssue': {'key': params['outwardissue']}, } url = restbase + '/issueLink/' @@ -378,6 +383,7 @@ OP_REQUIRED = dict(create=['project', 'issuetype', 'summary', 'description'], transition=['status'], link=['linktype', 'inwardissue', 'outwardissue']) + def main(): global module @@ -420,10 +426,10 @@ def main(): user = module.params['username'] passwd = module.params['password'] if module.params['assignee']: - module.params['fields']['assignee'] = { 'name': module.params['assignee'] } + module.params['fields']['assignee'] = {'name': module.params['assignee']} if not uri.endswith('/'): - uri = uri+'/' + uri = uri + '/' restbase = uri + 'rest/api/2' # Dispatch @@ -440,7 +446,6 @@ def main(): e = get_exception() return module.fail_json(msg=e.message) - module.exit_json(changed=True, meta=ret) diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt index dc6850fe7da..d49f5fbd3f5 100644 --- a/test/sanity/pep8/legacy-files.txt +++ b/test/sanity/pep8/legacy-files.txt @@ -770,7 +770,6 @@ lib/ansible/modules/web_infrastructure/ansible_tower/tower_user.py lib/ansible/modules/web_infrastructure/deploy_helper.py lib/ansible/modules/web_infrastructure/ejabberd_user.py lib/ansible/modules/web_infrastructure/jboss.py -lib/ansible/modules/web_infrastructure/jira.py lib/ansible/modules/windows/win_disk_image.py lib/ansible/modules/windows/win_dns_client.py lib/ansible/modules/windows/win_domain.py