a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove expanduser and use type path 

This patch removes the use of expanduser and replaces it with
type 'path'. This patch is related to #12263
pull/4420/head
Tim Rupp 2017-02-11 15:58:46 -08:00 committed by Brian Coca
parent c4d3bf3207
commit 4900201c5b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/cloud/amazon/ec2_win_password.py
View File

@ -92,7 +92,6 @@ tasks:
''' '''
from base64 import b64decode from base64 import b64decode
from os.path import expanduser
from Crypto.Cipher import PKCS1_v1_5 from Crypto.Cipher import PKCS1_v1_5
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA
import datetime import datetime
@ -107,7 +106,7 @@ def main():
argument_spec = ec2_argument_spec() argument_spec = ec2_argument_spec()
argument_spec.update(dict( argument_spec.update(dict(
instance_id = dict(required=True), instance_id = dict(required=True),
key_file = dict(required=True), key_file = dict(required=True, type='path'),
key_passphrase = dict(no_log=True, default=None, required=False), key_passphrase = dict(no_log=True, default=None, required=False),
wait = dict(type='bool', default=False, required=False), wait = dict(type='bool', default=False, required=False),
wait_timeout = dict(default=120, required=False), wait_timeout = dict(default=120, required=False),
@ -119,7 +118,7 @@ def main():
module.fail_json(msg='Boto required for this module.') module.fail_json(msg='Boto required for this module.')
instance_id = module.params.get('instance_id') instance_id = module.params.get('instance_id')
key_file = expanduser(module.params.get('key_file')) key_file = module.params.get('key_file')
key_passphrase = module.params.get('key_passphrase') key_passphrase = module.params.get('key_passphrase')
wait = module.params.get('wait') wait = module.params.get('wait')
wait_timeout = int(module.params.get('wait_timeout')) wait_timeout = int(module.params.get('wait_timeout'))