fixed order in sorts, fixed ldap error messages

pym/cl_ldap.py

@@ -225,7 +225,7 @@ class ldapFunction(cl_utils2.ldapFun):
                 parser = addLdif(strLdif,self.conLdap)
                 parser.parse()
             except ldap.LDAPError as e:
-                self.setError(e[0]['desc'])
+                self.setError(str(e))
                 return False
             except:
                 self.setError("Error in ldif file")
@@ -1193,7 +1193,7 @@ in a sambaDomainName',
         for linkRm in scanObjs[0].links:
             # Удаляем ссылки
             os.unlink(linkRm[1])
-        scanObjs[0].dirs.sort(key=len)
+        scanObjs[0].dirs.sort(key=len, reverse=True)
         for dirRm in scanObjs[0].dirs:
             # Удаляем директории
             os.rmdir(dirRm)
@@ -1487,7 +1487,7 @@ if you want to continue to run the program again"))
         try:
             self.conLdap.add_s(DN, entry)
         except ldap.LDAPError as e:
-            self.printERROR(_("LDAP Error") + ": " + e[0]['desc'].strip())
+            self.printERROR(_("LDAP Error") + ": " + str(e).strip())
             self.printERROR(errorMessage)
             return False
         return True
@@ -1552,7 +1552,7 @@ This command is not allowed."))
             try:
                 self.conLdap.modify_s(DN, modAttrs)
             except ldap.LDAPError as e:
-                self.printERROR(e[0]['desc'])
+                self.printERROR(str(e))
                 return False
         return True
 
@@ -1563,7 +1563,7 @@ This command is not allowed."))
         try:
             self.conLdap.modrdn_s(DN, newFirstDn)
         except ldap.LDAPError as e:
-            self.printERROR(e[0]['desc'])
+            self.printERROR(str(e))
             return False
         return True
 
@@ -1574,7 +1574,7 @@ This command is not allowed."))
         try:
             self.conLdap.delete_s(DN)
         except ldap.LDAPError as e:
-            self.printERROR(e[0]['desc'])
+            self.printERROR(str(e))
             return False
         return True
 
@@ -1603,7 +1603,7 @@ This command is not allowed."))
                                             ldap.SCOPE_SUBTREE,
                                             ldapFilter,None)
         except ldap.LDAPError as e:
-            self.printERROR("fullElementDN: "+e[0]['desc'])
+            self.printERROR("fullElementDN: " + str(e))
             return False
         FDOUT = StringIO.StringIO("")
         writer = LDIFWriter(FDOUT)
@@ -1682,17 +1682,17 @@ This command is not allowed."))
                                             '(objectclass=*)',
                                             [''])
         except ldap.LDAPError as e:
-            self.printERROR("deleteDN: "+e[0]['desc'])
+            self.printERROR("deleteDN: "+ str(e))
             return False
         for dn, f in dnList:
             delListDN.append(dn)
-        delListDN.sort(key=len)
+        delListDN.sort(key=len, reverse=True)
                         
         for dn in delListDN:
             try:
                 self.conLdap.delete_s(dn)
             except ldap.LDAPError as e:
-                self.printERROR("deleteDN: "+e[0]['desc'])
+                self.printERROR("deleteDN: " + str(e))
                 return False
         return True
 
@@ -2698,9 +2698,9 @@ class servUnix(shareLdap):
             return True
         modAttrs = []
         if 'registeredAddress' in searchUser[0][0][1]:
-            modAttrs.append((ldap.MOD_REPLACE, 'registeredAddress', jabberID))
+            modAttrs.append((ldap.MOD_REPLACE, 'registeredAddress', jabberID.encode("UTF-8")))
         else:
-            modAttrs.append((ldap.MOD_ADD, 'registeredAddress', jabberID))
+            modAttrs.append((ldap.MOD_ADD, 'registeredAddress', jabberID.encode("UTF-8")))
         userDN = self.addDN('uid='+userName,self.relUsersDN)
         if not self.modAttrsDN(userDN, modAttrs):
             self.printERROR(_("Can not modify registeredAddress attribute in \
@@ -12572,7 +12572,7 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
                 self.conLdap.add_s(self.clVars.Get("ld_repl_mail_dn"),
                                        entry)
             except ldap.LDAPError as e:
-                self.printERROR(_("LDAP Error") + ": " + e[0]['desc'].strip())
+                self.printERROR(_("LDAP Error") + ": " + str(e).strip())
                 self.printERROR(errorMessage)
                 return False
             except:
@@ -12587,7 +12587,7 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
                 self.conLdap.add_s(self.clVars.Get("ld_repl_worked_dn"),
                                        entry)
             except ldap.LDAPError as e:
-                self.printERROR(_("LDAP Error") + ": " + e[0]['desc'].strip())
+                self.printERROR(_("LDAP Error") + ": " + str(e).strip())
                 self.printERROR(errorMessage)
                 return False
             except:

pym/cl_profile.py

@@ -2431,7 +2431,7 @@ class profile(_file, _terms, xmlShare, processingTemplates):
         for fileRm in scanObjs[0].files:
             # Удаляем файлы
             os.remove(fileRm)
-        scanObjs[0].dirs.sort(key=len)
+        scanObjs[0].dirs.sort(key=len, reverse=True)
         for dirRm in scanObjs[0].dirs:
             # Удаляем директории
             os.rmdir(dirRm)
@@ -5423,6 +5423,18 @@ class ldap(samba):
             z += 1
         #print docObj.doc.toprettyxml()
         return docObj
+    
+    def getConfig(self):
+        """Выдает конфигурационный файл"""
+        listConfigTxt = []
+        childNodes = list(self.docObj.getNodeBody())
+        for node in childNodes:
+            if node.tag == "field":
+                listConfigTxt.append(self.docObj.getQuoteField(node))
+            elif node.tag == "area":
+                self.docObj.xmlToText([node], listConfigTxt)
+        tmp = "".join(listConfigTxt)
+        return "\n".join(x for x in tmp.split("\n") if x.strip())
 
 class dovecot(bind):
     """Класс для обработки конфигурационного файла типа dovecot

pym/cl_utils2.py

@@ -34,7 +34,7 @@ class ldapFun(cl_profile._error):
         try:
             self.conLdap = self.__ldapConnect(dnUser, password, host)
         except ldap.LDAPError as e:
-            self.setError(e[0]['desc'])
+            self.setError(str(e))
 
     def __ldapConnect(self, dnUser, password, host):
         """Соединение с LDAP сервером"""

pym/cl_vars.py

@@ -26,12 +26,12 @@ class Data:
     # имя компьютера
     os_net_hostname = {'mode':"w"}
     # разрешенные сети
-    os_net_allow ={}
+    os_net_allow = {}
     # ip на всех интерфейсах
-    os_net_ip ={}
+    os_net_ip = {}
 
     #короткое название системы (CLD)
-    os_linux_shortname={}
+    os_linux_shortname = {}
 
     #домен
     os_net_domain = {'mode':"w"}

setup.py

@@ -85,7 +85,7 @@ def create_data_files (data_dirs, prefix=""):
                     break
         for files_obj_dir in files_obj_dirs:
             obj.dirs.remove(files_obj_dir)
-        files_obj_dirs.sort(key=len)
+        files_obj_dirs.sort(key=len, reverse=True)
         for dir_name in files_obj_dirs:
             wr_sp = (prefix+dir_name,[])
             file_dirs = []