From 8f93a3963cab91603337f716c774021799e408c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=94=D0=B7=D1=8E=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= <id@calculate.ru>
Date: Thu, 23 Sep 2021 13:37:54 +0300
Subject: [PATCH] fixed LDAP error messages

---
 pym/calculate/lib/cl_ldap.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pym/calculate/lib/cl_ldap.py b/pym/calculate/lib/cl_ldap.py
index 7d71011..f51a665 100644
--- a/pym/calculate/lib/cl_ldap.py
+++ b/pym/calculate/lib/cl_ldap.py
@@ -42,7 +42,7 @@ class ldapFun(_error):
         try:
             self.conLdap = self.__ldapConnect(dnUser, password, host)
         except ldap.LDAPError as e:
-            self.setError(e[0]['desc'])
+            self.setError(e.args[0]['desc'])
 
     def __ldapConnect(self, dnUser, password, host):
         """Соединение с LDAP сервером"""
@@ -102,7 +102,7 @@ class LDAPConnect(ldapFun):
         except ldap.NO_SUCH_OBJECT:
             pass
         except ldap.LDAPError as e:
-            error = e[0]['desc']
+            error = e.args[0]['desc']
             if "Bad search filter" in error:
                 raise LDAPBadSearchFilter(error)
             raise LDAPConnectError(error)
@@ -129,7 +129,7 @@ class LDAPConnect(ldapFun):
         except ldap.NO_SUCH_OBJECT:
             pass
         except ldap.LDAPError as e:
-            error = e[0]['desc']
+            error = e.args[0]['desc']
             if "Bad search filter" in error:
                 raise LDAPBadSearchFilter(error)
             raise LDAPConnectError(error)
@@ -157,7 +157,7 @@ class LDAPConnect(ldapFun):
             try:
                 self.conLdap.modify_s(base_dn, attrs)
             except ldap.LDAPError as e:
-                raise LDAPConnectError(e[0]['desc'])
+                raise LDAPConnectError(e.args[0]['desc'])
 
     def ldap_modify_dn(self, base_dn, new_dn):
         """
@@ -169,7 +169,7 @@ class LDAPConnect(ldapFun):
         try:
             self.conLdap.modrdn_s(base_dn, new_dn)
         except ldap.LDAPError as e:
-            raise LDAPConnectError(e[0]['desc'])
+            raise LDAPConnectError(e.args[0]['desc'])
 
     def ldap_remove_dn(self, base_dn):
         """
@@ -180,7 +180,7 @@ class LDAPConnect(ldapFun):
         try:
             self.conLdap.delete_s(base_dn)
         except ldap.LDAPError as e:
-            raise LDAPConnectError(e[0]['desc'])
+            raise LDAPConnectError(e.args[0]['desc'])
 
 
 
@@ -191,7 +191,7 @@ class LDAPConnect(ldapFun):
             #    try:
             #        self.conLdap.modrdn_s(DN, newFirstDn)
             #    except ldap.LDAPError, e:
-            #        self.printERROR(e[0]['desc'])
+            #        self.printERROR(e.args[0]['desc'])
             #        return False
             #    return True
 
@@ -202,7 +202,7 @@ class LDAPConnect(ldapFun):
             #    try:
             #        self.conLdap.delete_s(DN)
             #    except ldap.LDAPError, e:
-            #        self.printERROR(e[0]['desc'])
+            #        self.printERROR(e.args[0]['desc'])
             #        return False
             #    return True
 
@@ -418,7 +418,7 @@ class LDIFAdd(LDIFParser):
         try:
             self.ldap_connect.add_s(dn, entry.items())
         except ldap.LDAPError as e:
-            raise LDIFError(e[0]['desc'])
+            raise LDIFError(e.args[0]['desc'])
         except Exception as e:
             print(str(e))
             raise LDIFError(_("Error in LDIF file"))