valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch open() for salt.utils.fopen()

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-27 21:16:35 +00:00
parent 733b31da23
commit 0c9da726f5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/file.py
View File

@ -3872,9 +3872,11 @@ def serialize(name,
if merge_if_exists:
if os.path.isfile(name):
if formatter == 'yaml':
existing_data = yaml.safe_load(open(name, 'r'))
with salt.utils.fopen(name, 'r') as fhr:
existing_data = yaml.safe_load(fhr.read())
elif formatter == 'json':
existing_data = json.load(open(name, 'r'))
with salt.utils.fopen(name, 'r') as fhr:
existing_data = json.load(fhr.read())
else:
return {'changes': {},
'comment': ('{0} format is not supported for merging'