wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12780 from mgedmin/py3k

Browse source 
Python 3: avoid %-formatting of byte strings
This commit is contained in:
Toshio Kuratomi 2015-10-16 07:40:10 -07:00
commit 38b99a7a4d
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -194,10 +194,12 @@ class VaultLib:
if not self.cipher_name: if not self.cipher_name:
raise AnsibleError("the cipher must be set before adding a header") raise AnsibleError("the cipher must be set before adding a header")
tmpdata = [b'%s\n' % b_data[i:i+80] for i in range(0, len(b_data), 80)] header = b';'.join([b_HEADER, self.b_version,
tmpdata.insert(0, b'%s;%s;%s\n' % (b_HEADER, self.b_version, to_bytes(self.cipher_name, errors='strict', encoding='utf-8')])
to_bytes(self.cipher_name, errors='strict', encoding='utf-8'))) tmpdata = [header]
tmpdata = b''.join(tmpdata) tmpdata += [b_data[i:i+80] for i in range(0, len(b_data), 80)]
tmpdata += [b'']
tmpdata = b'\n'.join(tmpdata)
return tmpdata return tmpdata
@ -422,7 +424,7 @@ class VaultAES:
d = d_i = b'' d = d_i = b''
while len(d) < key_length + iv_length: while len(d) < key_length + iv_length:
text = b"%s%s%s" % (d_i, password, salt) text = b''.join([d_i, password, salt])
d_i = to_bytes(md5(text).digest(), errors='strict') d_i = to_bytes(md5(text).digest(), errors='strict')
d += d_i d += d_i
@ -568,7 +570,7 @@ class VaultAES256:
# COMBINE SALT, DIGEST AND DATA # COMBINE SALT, DIGEST AND DATA
hmac = HMAC.new(key2, cryptedData, SHA256) hmac = HMAC.new(key2, cryptedData, SHA256)
message = b'%s\n%s\n%s' % (hexlify(salt), to_bytes(hmac.hexdigest()), hexlify(cryptedData)) message = b'\n'.join([hexlify(salt), to_bytes(hmac.hexdigest()), hexlify(cryptedData)])
message = hexlify(message) message = hexlify(message)
return message return message

2
tox.ini
View file

@ -10,4 +10,4 @@ commands =
py27: python -m compileall -fq -x 'test|samples' lib test contrib py27: python -m compileall -fq -x 'test|samples' lib test contrib
py{34,35}: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib py{34,35}: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
# Unittests need lots of work to make code python3 compatible # Unittests need lots of work to make code python3 compatible
py{26,27,35}: make tests py{26,27,34,35}: make tests