cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix crypttab python3 compatibility issue (#30457)

Browse source 
In python2 str gives byte string. In Python3 it gives unicode string so it
can't be written in a binary mode opened file.
Use to_bytes helper function to ensure content being written will be
properly encoded in both python2 and python3.
This commit is contained in:
Jonathan Piron 2017-09-27 20:58:02 +02:00 committed by Toshio Kuratomi
parent e63d949951
commit 54859a2132
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/system/crypttab.py
View file

@ -89,7 +89,7 @@ import os
import traceback import traceback
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_bytes, to_native
def main(): def main():
@ -169,7 +169,7 @@ def main():
if changed and not module.check_mode: if changed and not module.check_mode:
try: try:
f = open(path, 'wb') f = open(path, 'wb')
f.write(str(crypttab)) f.write(to_bytes(crypttab, errors='surrogate_or_strict'))
finally: finally:
f.close() f.close()