From 85f7da979294d5bc18c6045465d2955945be3109 Mon Sep 17 00:00:00 2001 From: Victor Coutellier Date: Thu, 14 Mar 2019 23:33:08 +0100 Subject: [PATCH] Fix action_plugins python3 compatibility Fix filemode in the merge_configs and merge_yaml action plugin to be compatible with python3 Change-Id: Ief64c5bdcd717141281e23c255a49ec02a96aef2 Closes-Bug: #1820134 --- ansible/action_plugins/merge_configs.py | 2 +- ansible/action_plugins/merge_yaml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py index 12b3234510..b58d6d7acf 100644 --- a/ansible/action_plugins/merge_configs.py +++ b/ansible/action_plugins/merge_configs.py @@ -176,7 +176,7 @@ class ActionModule(action.ActionBase): try: result_file = os.path.join(local_tempdir, 'source') - with open(result_file, 'wb') as f: + with open(result_file, 'w') as f: f.write(full_source) new_task = self._task.copy() diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py index 75f49d506a..bf974050cd 100755 --- a/ansible/action_plugins/merge_yaml.py +++ b/ansible/action_plugins/merge_yaml.py @@ -121,7 +121,7 @@ class ActionModule(action.ActionBase): try: result_file = os.path.join(local_tempdir, 'source') - with open(result_file, 'wb') as f: + with open(result_file, 'w') as f: f.write(dump(output, default_flow_style=False)) new_task = self._task.copy()