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:
parent
c5324f54e6
commit
4519dd5f4d
2 changed files with 9 additions and 4 deletions
|
@ -113,7 +113,7 @@ options:
|
|||
- all arguments accepted by the M(file) module also work here
|
||||
required: false
|
||||
# informational: requirements for nodes
|
||||
requirements: [ urllib2, urlparse ]
|
||||
requirements: [ ]
|
||||
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
|
||||
'''
|
||||
|
||||
import urlparse
|
||||
|
||||
try:
|
||||
import hashlib
|
||||
HAS_HASHLIB=True
|
||||
|
@ -315,4 +317,5 @@ def main():
|
|||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
from ansible.module_utils.urls import *
|
||||
main()
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -60,9 +60,10 @@ EXAMPLES = '''
|
|||
# Example action to ensure a key is not present in the db
|
||||
- rpm_key: state=absent key=DEADB33F
|
||||
'''
|
||||
import re
|
||||
import syslog
|
||||
import os.path
|
||||
import re
|
||||
import urllib2
|
||||
import tempfile
|
||||
|
||||
def is_pubkey(string):
|
||||
|
@ -203,4 +204,5 @@ def main():
|
|||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
from ansible.module_utils.urls import *
|
||||
main()
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Reference in a new issue