diff options
author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-07-20 23:02:44 -0700 |
---|---|---|
committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-07-20 23:04:27 -0700 |
commit | 79173ac18de66bcdb6c25729fb4561c772d37cab (patch) | |
tree | 01e91c532bb4ada246dc2e64d7f1a2bbeb7bac5b | |
parent | d5dd5f461f1aa74b9f5c368bd74050cb7a7aa382 (diff) | |
download | ansible-modules-extras-79173ac18de66bcdb6c25729fb4561c772d37cab.tar.gz |
Clean up unneeded urllib2 imports
-rw-r--r-- | clustering/consul.py | 6 | ||||
-rw-r--r-- | clustering/consul_acl.py | 4 | ||||
-rw-r--r-- | clustering/consul_kv.py | 4 | ||||
-rw-r--r-- | clustering/consul_session.py | 4 | ||||
-rw-r--r-- | database/misc/riak.py | 5 | ||||
-rw-r--r-- | monitoring/bigpanda.py | 6 | ||||
-rw-r--r-- | monitoring/boundary_meter.py | 4 | ||||
-rw-r--r-- | monitoring/datadog_event.py | 6 | ||||
-rw-r--r-- | network/a10/a10_virtual_server.py | 8 |
9 files changed, 22 insertions, 25 deletions
diff --git a/clustering/consul.py b/clustering/consul.py index 11651757..f72fc6dd 100644 --- a/clustering/consul.py +++ b/clustering/consul.py @@ -166,7 +166,6 @@ EXAMPLES = ''' ''' import sys -import urllib2 try: import json @@ -179,7 +178,7 @@ try: python_consul_installed = True except ImportError, e: python_consul_installed = False - + def register_with_consul(module): state = module.params.get('state') @@ -503,4 +502,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/clustering/consul_acl.py b/clustering/consul_acl.py index 250de24e..c133704b 100644 --- a/clustering/consul_acl.py +++ b/clustering/consul_acl.py @@ -92,7 +92,6 @@ EXAMPLES = ''' ''' import sys -import urllib2 try: import consul @@ -318,4 +317,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/clustering/consul_kv.py b/clustering/consul_kv.py index b0d07dda..06dd55b7 100644 --- a/clustering/consul_kv.py +++ b/clustering/consul_kv.py @@ -121,7 +121,6 @@ EXAMPLES = ''' ''' import sys -import urllib2 try: import json @@ -261,4 +260,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/clustering/consul_session.py b/clustering/consul_session.py index ef4646c3..c298ea7f 100644 --- a/clustering/consul_session.py +++ b/clustering/consul_session.py @@ -114,7 +114,6 @@ EXAMPLES = ''' ''' import sys -import urllib2 try: import consul @@ -266,4 +265,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * -main() +if __name__ == '__main__': + main() diff --git a/database/misc/riak.py b/database/misc/riak.py index 12586651..453e6c15 100644 --- a/database/misc/riak.py +++ b/database/misc/riak.py @@ -97,7 +97,6 @@ EXAMPLES = ''' - riak: wait_for_service=kv ''' -import urllib2 import time import socket import sys @@ -254,5 +253,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.urls import * - -main() +if __name__ == '__main__': + main() diff --git a/monitoring/bigpanda.py b/monitoring/bigpanda.py index 3bed4489..cd08ac9f 100644 --- a/monitoring/bigpanda.py +++ b/monitoring/bigpanda.py @@ -59,7 +59,7 @@ options: choices: ['yes', 'no'] # informational: requirements for nodes -requirements: [ urllib, urllib2 ] +requirements: [ ] ''' EXAMPLES = ''' @@ -168,5 +168,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.urls import * - -main() +if __name__ == '__main__': + main() diff --git a/monitoring/boundary_meter.py b/monitoring/boundary_meter.py index 431a6ace..3e03a55c 100644 --- a/monitoring/boundary_meter.py +++ b/monitoring/boundary_meter.py @@ -38,7 +38,6 @@ author: "curtis (@ccollicutt)" requirements: - Boundary API access - bprobe is required to send data, but not to register a meter - - Python urllib2 options: name: description: @@ -252,5 +251,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.urls import * -main() +if __name__ == '__main__': + main() diff --git a/monitoring/datadog_event.py b/monitoring/datadog_event.py index ebbad039..406a5ea1 100644 --- a/monitoring/datadog_event.py +++ b/monitoring/datadog_event.py @@ -16,7 +16,7 @@ description: version_added: "1.3" author: "Artūras `arturaz` Šlajus (@arturaz)" notes: [] -requirements: [urllib2] +requirements: [] options: api_key: description: ["Your DataDog API key."] @@ -139,5 +139,5 @@ def post_event(module): # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.urls import * - -main() +if __name__ == '__main__': + main() diff --git a/network/a10/a10_virtual_server.py b/network/a10/a10_virtual_server.py index eb308a30..2dbaa912 100644 --- a/network/a10/a10_virtual_server.py +++ b/network/a10/a10_virtual_server.py @@ -31,9 +31,7 @@ description: author: "Mischa Peters (@mischapeters)" notes: - Requires A10 Networks aXAPI 2.1 -requirements: - - urllib2 - - re +requirements: [] options: host: description: @@ -294,6 +292,6 @@ def main(): from ansible.module_utils.basic import * from ansible.module_utils.urls import * from ansible.module_utils.a10 import * - -main() +if __name__ == '__main__': + main() |