encoding fixes

pym/cl_ldap.py

@@ -15031,7 +15031,7 @@ with another option."))
                 memberUid = searchRes[0][0][1]['memberUid']
             groupId = searchRes[0][0][1]['gidNumber'][0].decode("UTF-8")
             primaryUids = self.getUnixUidPrimGroup(groupId)
-            memberUid = [x.encode("UTF-8") for x in primaryUids] + memberUid
+            memberUid = [x for x in primaryUids] + [x.encode("UTF-8") for x in memberUid]
             uniqueUid = []
             # Удаляем одинаковые элементы
             for uid in memberUid:
@@ -15044,10 +15044,9 @@ with another option."))
                 attr = retrAttrs[i]
                 attrName = attributes[i]
                 if attr in info[0][1]:
-                    ldapValue = info[0][1][attr]
+                    ldapValue = info[0][1][attr].decode("UTF-8")
                     # Изменяем значения аттрибутов для вывода на печать
                     for i in range(len(ldapValue)):
-                        #modGroupAttr already decodes
                         ldapValue[i] = self.modGroupAttr(attr, ldapValue[i],
                                                          service)
                     flagFirst = False
@@ -20856,7 +20855,7 @@ class servDhcp(shareLdap, shareIP):
             flagDelARecord = True
             if 'aRecord' in recData[0][0][1]:
                 aRecords = recData[0][0][1]['aRecord']
-                if ip in aRecords:
+                if ip.encode("UTF-8") in aRecords:
                     flagCreateARecord = False
                     flagDelARecord = False
                 if delDNSRecord and checkName:
@@ -21101,7 +21100,7 @@ incompatible, use one of the options"))
                 if recData:
                     if 'aRecord' in recData[0][0][1]:
                         aRecords = recData[0][0][1]['aRecord']
-                        if ip in aRecords:
+                        if ip.encode("UTF-8") in aRecords:
                             retData[fullDomainName] = ip
                         else:
                             self.printERROR(_("DHCP static host %s")%hostname)
@@ -21487,7 +21486,7 @@ network %s") % net)
                     if recData:
                         if 'aRecord' in recData[0][0][1]:
                             aRecords = recData[0][0][1]['aRecord']
-                            if not ip in aRecords:
+                            if not ip.encode("UTF-8") in aRecords:
                                 flagError = True
                         else:
                             flagError = True
@@ -22084,7 +22083,7 @@ network %s") % net)
                                                             fullHostNameServer)
                 if recData and 'aRecord' in recData[0][0][1]:
                     flagFoundARecord = True
-                    if ipServer in recData[0][0][1]['aRecord']:
+                    if ipServer.encode("UTF-8") in recData[0][0][1]['aRecord']:
                         flagCreateDNSRecord = False
                     else:
                         flagDeleteARecord = True