Small cleanups.

* Import url(lib|parse|lib2) if needed by the module rather than relying
  on module_utils.urls to do so.
* Remove stdlib modules from requirements
* Use the if __name__ conditional for invoking main()
This commit is contained in:
Toshio Kuratomi 2015-06-24 06:51:00 -07:00
parent c5324f54e6
commit 4519dd5f4d
2 changed files with 9 additions and 4 deletions

View file

@ -113,7 +113,7 @@ options:
- all arguments accepted by the M(file) module also work here - all arguments accepted by the M(file) module also work here
required: false required: false
# informational: requirements for nodes # informational: requirements for nodes
requirements: [ urllib2, urlparse ] requirements: [ ]
author: "Jan-Piet Mens (@jpmens)" author: "Jan-Piet Mens (@jpmens)"
''' '''
@ -125,6 +125,8 @@ EXAMPLES='''
get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf sha256sum=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf sha256sum=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
''' '''
import urlparse
try: try:
import hashlib import hashlib
HAS_HASHLIB=True HAS_HASHLIB=True
@ -315,4 +317,5 @@ def main():
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.urls import * from ansible.module_utils.urls import *
main() if __name__ == '__main__':
main()

View file

@ -60,9 +60,10 @@ EXAMPLES = '''
# Example action to ensure a key is not present in the db # Example action to ensure a key is not present in the db
- rpm_key: state=absent key=DEADB33F - rpm_key: state=absent key=DEADB33F
''' '''
import re
import syslog import syslog
import os.path import os.path
import re import urllib2
import tempfile import tempfile
def is_pubkey(string): def is_pubkey(string):
@ -203,4 +204,5 @@ def main():
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.urls import * from ansible.module_utils.urls import *
main() if __name__ == '__main__':
main()