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

make salt.utils.to_unicode return none when passed none

Browse source
This commit is contained in:
twangboy 2017-10-20 15:10:19 -06:00
parent ce41acc788
commit 221e6e3b91
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/modules/reg.py
View file

@ -76,16 +76,16 @@ def __virtual__():
def _to_mbcs(vdata):
'''
Converts unicode to to current users character encoding.
Converts unicode to to current users character encoding. Use this for values
returned by reg functions
'''
return salt.utils.to_unicode(vdata, 'mbcs')
def _to_unicode(vdata):
'''
Converts from current users character encoding to unicode.
When instr has a value of None, the return value of the function
will also be None.
Converts from current users character encoding to unicode. Use this for
parameters being pass to reg functions
'''
return salt.utils.to_unicode(vdata, 'utf-8')
@ -161,13 +161,8 @@ def _key_exists(hive, key, use_32bit_registry=False):
:return: Returns True if found, False if not found
:rtype: bool
'''
if PY2:
local_hive = _to_unicode(hive)
local_key = _to_unicode(key)
else:
local_hive = hive
local_key = key
local_hive = _to_unicode(hive)
local_key = _to_unicode(key)
registry = Registry()
hkey = registry.hkeys[local_hive]
@ -357,7 +352,7 @@ def read_value(hive, key, vname=None, use_32bit_registry=False):
# Setup the return array
local_hive = _to_unicode(hive)
local_key = _to_unicode(key)
local_vname = _to_unicode(vname) if vname else None
local_vname = _to_unicode(vname)
ret = {'hive': local_hive,
'key': local_key,
@ -497,7 +492,7 @@ def set_value(hive,
'''
local_hive = _to_unicode(hive)
local_key = _to_unicode(key)
local_vname = _to_unicode(vname) if vname else None
local_vname = _to_unicode(vname)
local_vtype = _to_unicode(vtype)
registry = Registry()
@ -668,7 +663,7 @@ def delete_value(hive, key, vname=None, use_32bit_registry=False):
local_hive = _to_unicode(hive)
local_key = _to_unicode(key)
local_vname = _to_unicode(vname) if vname else None
local_vname = _to_unicode(vname)
registry = Registry()
hkey = registry.hkeys[local_hive]

2
salt/utils/__init__.py
View file

@ -3070,6 +3070,8 @@ def to_unicode(s, encoding=None):
'''
Given str or unicode, return unicode (str for python 3)
'''
if s is None:
return s
if six.PY3:
return to_str(s, encoding)
else: