From 61c2968a7c99cfdf478a79449d1d2819bad7902d Mon Sep 17 00:00:00 2001 From: beeankha Date: Fri, 13 Dec 2019 15:50:48 -0500 Subject: [PATCH] Fix module-specific lint errors --- awx_collection/plugins/inventory/tower.py | 4 ++-- awx_collection/plugins/module_utils/ansible_tower.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx_collection/plugins/inventory/tower.py b/awx_collection/plugins/inventory/tower.py index 044eb09dd1..01bc781558 100644 --- a/awx_collection/plugins/inventory/tower.py +++ b/awx_collection/plugins/inventory/tower.py @@ -161,7 +161,7 @@ class InventoryModule(BaseInventoryPlugin): inventory_url = '/api/v2/inventories/{inv_id}/script/?hostvars=1&towervars=1&all=1'.format(inv_id=inventory_id) inventory_url = urljoin(tower_host, inventory_url) - inventory = self.make_request(request_handler, inventory_url) + inventory = make_request(request_handler, inventory_url) # To start with, create all the groups. for group_name in inventory: if group_name != '_meta': @@ -191,7 +191,7 @@ class InventoryModule(BaseInventoryPlugin): # Fetch extra variables if told to do so if self.get_option('include_metadata'): config_url = urljoin(tower_host, '/api/v2/config/') - config_data = self.make_request(request_handler, config_url) + config_data = make_request(request_handler, config_url) server_data = {} server_data['license_type'] = config_data.get('license_info', {}).get('license_type', 'unknown') for key in ('version', 'ansible_version'): diff --git a/awx_collection/plugins/module_utils/ansible_tower.py b/awx_collection/plugins/module_utils/ansible_tower.py index 52be49babe..495d60e39c 100644 --- a/awx_collection/plugins/module_utils/ansible_tower.py +++ b/awx_collection/plugins/module_utils/ansible_tower.py @@ -33,7 +33,7 @@ import json import os import traceback from ansible.module_utils._text import to_native -from ansible.module_utils.urls import Request, urllib_error, ConnectionError, socket, httplib +from ansible.module_utils.urls import urllib_error, ConnectionError, socket, httplib from ansible.errors import AnsibleParserError TOWER_CLI_IMP_ERR = None @@ -50,7 +50,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule, missing_required_lib -def make_request(self, request_handler, tower_url): +def make_request(module, request_handler, tower_url): ''' Makes the request to given URL, handles errors, returns JSON '''