calculate
/
calculate-utils-3-lib
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed LDAP error messages

Browse Source
master
Иван Дзюбенко 3 years ago
parent ffe7d8059d
commit 8f93a3963c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
pym/calculate/lib/cl_ldap.py
Unescape View File

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

Write Preview
Loading…
Cancel
Save