ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 14:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix format strings for python2.6

Browse source
This commit is contained in:
Toshio Kuratomi 2015-05-08 13:10:40 -07:00
commit 3a87b2727d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/parsing/vault/__init__.py
View file

@ -102,7 +102,7 @@ class VaultLib(object):
cipher = globals()['Vault' + self.cipher_name] cipher = globals()['Vault' + self.cipher_name]
this_cipher = cipher() this_cipher = cipher()
else: else:
raise errors.AnsibleError("{} cipher could not be found".format(self.cipher_name)) raise errors.AnsibleError("{0} cipher could not be found".format(self.cipher_name))
""" """
# combine sha + data # combine sha + data
@ -135,7 +135,7 @@ class VaultLib(object):
cipher = globals()['Vault' + ciphername] cipher = globals()['Vault' + ciphername]
this_cipher = cipher() this_cipher = cipher()
else: else:
raise errors.AnsibleError("{} cipher could not be found".format(ciphername)) raise errors.AnsibleError("{0} cipher could not be found".format(ciphername))
# try to unencrypt data # try to unencrypt data
data = this_cipher.decrypt(data, self.password) data = this_cipher.decrypt(data, self.password)
@ -379,7 +379,7 @@ class VaultAES(object):
d = d_i = b'' d = d_i = b''
while len(d) < key_length + iv_length: while len(d) < key_length + iv_length:
text = "{}{}{}".format(d_i, password, salt) text = "{0}{1}{2}".format(d_i, password, salt)
d_i = md5(to_bytes(text)).digest() d_i = md5(to_bytes(text)).digest()
d += d_i d += d_i