ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-27 19:39:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Change exceptions to python3 syntax.

Browse source
This commit is contained in:
ian 2015-04-13 12:35:20 -04:00
parent 62c08d96e5
commit 6747f82547
22 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
v2/ansible/utils/vault.py
View file

@ -40,7 +40,7 @@ def read_vault_file(vault_password_file):
try:
# STDERR not captured to make it easier for users to prompt for input in their scripts
p = subprocess.Popen(this_path, stdout=subprocess.PIPE)
except OSError, e:
except OSError as e:
raise AnsibleError("Problem running vault password script %s (%s). If this is not a script, remove the executable bit from the file." % (' '.join(this_path), e))
stdout, stderr = p.communicate()
vault_pass = stdout.strip('\r\n')
@ -49,7 +49,7 @@ def read_vault_file(vault_password_file):
f = open(this_path, "rb")
vault_pass=f.read().strip()
f.close()
except (OSError, IOError), e:
except (OSError, IOError) as e:
raise AnsibleError("Could not read vault password file %s: %s" % (this_path, e))
return vault_pass