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

Update unicode changes with proper list handling in open files

Browse Source
This commit is contained in:
rallytime 2018-01-19 16:38:23 -05:00
parent 9effd08bb3
commit 0dc7345102
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/incron.py
View File

@ -11,6 +11,7 @@ import os
# Import salt libs
from salt.ext import six
from salt.ext.six.moves import range
import salt.utils.data
import salt.utils.files
import salt.utils.functools
import salt.utils.stringutils
@ -104,8 +105,8 @@ def _write_incron_lines(user, lines):
return ret
else:
path = salt.utils.files.mkstemp()
with salt.utils.files.fopen(path, 'w+') as fp_:
fp_.writelines(salt.utils.stringutils.to_str(lines))
with salt.utils.files.fopen(path, 'wb') as fp_:
fp_.writelines(salt.utils.data.encode(lines))
if __grains__['os_family'] == 'Solaris' and user != "root":
__salt__['cmd.run']('chown {0} {1}'.format(user, path), python_shell=False)
ret = __salt__['cmd.run_all'](_get_incron_cmdstr(path), runas=user, python_shell=False)
@ -119,7 +120,7 @@ def _write_file(folder, filename, data):
'''
path = os.path.join(folder, filename)
if not os.path.exists(folder):
msg = '%s cannot be written. %s does not exist', filename, folder
msg = '{0} cannot be written. {1} does not exist'.format(filename, folder)
log.error(msg)
raise AttributeError(six.text_type(msg))
with salt.utils.files.fopen(path, 'w') as fp_:
@ -135,7 +136,7 @@ def _read_file(folder, filename):
path = os.path.join(folder, filename)
try:
with salt.utils.files.fopen(path, 'rb') as contents:
return salt.utils.stringutils.to_unicode(contents.readlines())
return salt.utils.data.decode(contents.readlines())
except (OSError, IOError):
return ''

5
salt/modules/ini_manage.py
View File

@ -15,6 +15,7 @@ import os
import re
# Import Salt libs
import salt.utils.data
import salt.utils.files
import salt.utils.json
import salt.utils.stringutils
@ -395,10 +396,10 @@ class _Ini(_Section):
def flush(self):
try:
with salt.utils.files.fopen(self.name, 'w') as outfile:
with salt.utils.files.fopen(self.name, 'wb') as outfile:
ini_gen = self.gen_ini()
next(ini_gen)
outfile.writelines(salt.utils.stringutils.to_str(ini_gen))
outfile.writelines(salt.utils.data.encode(ini_gen))
except (OSError, IOError) as exc:
raise CommandExecutionError(
"Unable to write file '{0}'. "