saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update utils paths

Browse source
This commit is contained in:
rallytime 2018-02-24 06:55:09 -05:00
parent cffbf52c10
commit 69ac94baca
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/reg.py
View file

@ -193,7 +193,7 @@ def present(name,
return ret
try:
vdata_decoded = salt.utils.to_unicode(vdata, 'utf-8')
vdata_decoded = salt.utils.stringutils.to_unicode(vdata, 'utf-8')
except UnicodeDecodeError:
# vdata contains binary data that can't be decoded
vdata_decoded = vdata

4
tests/unit/utils/test_win_functions.py
View file

@ -11,8 +11,8 @@ from tests.support.mock import (
)
# Import Salt Libs
import salt.utils.platform
import salt.utils.win_functions as win_functions
import salt.utils
@skipIf(NO_MOCK, NO_MOCK_REASON)
@ -53,7 +53,7 @@ class WinFunctionsTestCase(TestCase):
self.assertEqual(encoded, '^"C:\\Some Path\\With Spaces^"')
@skipIf(not salt.utils.is_windows(), 'WinDLL only available on Windows')
@skipIf(not salt.utils.platform.is_windows(), 'WinDLL only available on Windows')
def test_broadcast_setting_change(self):
'''
Test to rehash the Environment variables