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

Add suggested changes

Browse Source
This commit is contained in:
twangboy 2018-05-23 13:34:33 -06:00
parent e27e9fd1e7
commit 6eff2f847b
No known key found for this signature in database
GPG Key ID: 93FF3BDEB278C9EB
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/files.py
View File

@ -826,7 +826,7 @@ def get_encoding(path):
] ]
for _encoding, bom in boms: for _encoding, bom in boms:
if _data.startswith(bom): if _data.startswith(bom):
log.debug('Found BOM for {0}'.format(_encoding)) log.debug('Found BOM for %s', _encoding)
return _encoding return _encoding
return False return False

2
tests/unit/modules/test_file.py
View File

@ -237,7 +237,7 @@ class FileBlockReplaceTestCase(TestCase, LoaderModuleMockMixin):
'__grains__': {'kernel': 'Linux'}, '__grains__': {'kernel': 'Linux'},
'__utils__': { '__utils__': {
'files.is_binary': MagicMock(return_value=False), 'files.is_binary': MagicMock(return_value=False),
'files.get_encoding': MagicMock(return_value=None) 'files.get_encoding': MagicMock(return_value='utf-8')
}, },
} }
} }