From 5c56e79a8f6f04ce53e8875d45795ab36aefa37c Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 6 Feb 2017 13:04:54 -0800 Subject: [PATCH] Cleanup imports --- lib/ansible/modules/cloud/amazon/_ec2_ami_search.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py index a8495ac13b..0e0f25831e 100644 --- a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py +++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py @@ -94,8 +94,10 @@ EXAMPLES = ''' ''' import csv -import json -import ansible.module_utils.six.moves.urllib.parse as urlparse + +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.urls import fetch_url + SUPPORTED_DISTROS = ['ubuntu'] @@ -115,6 +117,7 @@ AWS_REGIONS = ['ap-northeast-1', 'us-west-2', "us-gov-west-1"] + def get_url(module, url): """ Get url and return response """ @@ -209,10 +212,5 @@ def main(): module.fail_json(msg="Unsupported distro: %s" % distro) - -# this is magic, see lib/ansible/module_common.py -from ansible.module_utils.basic import * -from ansible.module_utils.urls import * - if __name__ == '__main__': main()