From 63ffff3b760f5927e38acf86b10e49b2ef2e998c Mon Sep 17 00:00:00 2001 From: beeankha Date: Fri, 20 Dec 2019 08:53:02 -0500 Subject: [PATCH] Import request into module_utils instead --- awx_collection/plugins/inventory/tower.py | 3 +-- awx_collection/plugins/module_utils/ansible_tower.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx_collection/plugins/inventory/tower.py b/awx_collection/plugins/inventory/tower.py index 6785d738aa..ad463434eb 100644 --- a/awx_collection/plugins/inventory/tower.py +++ b/awx_collection/plugins/inventory/tower.py @@ -102,13 +102,12 @@ import os import re from ansible.module_utils import six -from ansible.module_utils.urls import Request from ansible.module_utils._text import to_text, to_native from ansible.errors import AnsibleOptionsError from ansible.plugins.inventory import BaseInventoryPlugin from ansible.config.manager import ensure_type -from ..module_utils.ansible_tower import make_request +from ..module_utils.ansible_tower import make_request, Request # Python 2/3 Compatibility try: diff --git a/awx_collection/plugins/module_utils/ansible_tower.py b/awx_collection/plugins/module_utils/ansible_tower.py index e3972fb7d8..692ad49ced 100644 --- a/awx_collection/plugins/module_utils/ansible_tower.py +++ b/awx_collection/plugins/module_utils/ansible_tower.py @@ -35,6 +35,7 @@ import traceback from ansible.module_utils._text import to_native from ansible.module_utils.urls import urllib_error, ConnectionError, socket, httplib +from ansible.module_utils.urls import Request # noqa (the sole purpose of this line is to allow for import into other files) from ansible.errors import AnsibleParserError TOWER_CLI_IMP_ERR = None