fixed samba related encoding errors

master
parent 4feface43d
commit 17e4e5ae10

@ -89,7 +89,7 @@ class Lang:
trans = lambda x: x
else:
la = [l]
reload(gettext)
# reload(gettext)
if gettext.find(self.nameDomain, self.__catalog, la):
"""Если найден словарь то инициализируем переводчик"""
transl = gettext.translation(self.nameDomain, self.__catalog,

@ -68,6 +68,6 @@ class convertEnv():
if k in self.convertData:
service = self.convertData[k]['service']
service_key = self.convertData[k]['replace']
value = convertStrListDict(v.encode('utf-8'))
value = convertStrListDict(v)
convert_vars[service][service_key] = value
return convert_vars

@ -385,12 +385,14 @@ class Pinger():
# Handle bytes in pairs (decoding as short ints)
while count < countTo:
#note: no need for ord(bytes[i]) in py3, bytes already
# return int values when accessed via indeces
if sys.byteorder == "little":
loByte = ord(source_string[count])
hiByte = ord(source_string[count + 1])
loByte = source_string[count]
hiByte = source_string[count + 1]
else:
loByte = ord(source_string[count + 1])
hiByte = ord(source_string[count])
loByte = source_string[count + 1]
hiByte = source_string[count]
sum += hiByte * 256 + loByte
count += 2

@ -67,7 +67,7 @@ class LdapHelper():
user_obj = self.getLdapUserObject()
if ldapUser and isinstance(user_obj, ldapUser):
if user_obj.connectLdap():
return [ x[0][1]['uid'][0] for x in user_obj.ldapObj.ldapSearch(
return [ x[0][1]['uid'][0].decode("UTF-8") for x in user_obj.ldapObj.ldapSearch(
user_obj.getUsersDN(),
ldap.SCOPE_ONELEVEL, '(objectClass=*)',
['uid'])]

Loading…
Cancel
Save