crans/lc_ldap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ldap_locks] cast all the things ! python-ldap déteste l'unicode

Browse source
This commit is contained in:
Valentin Samir 2014-11-09 23:35:34 +01:00
parent 294773ba6e
commit e97f857310
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ldap_locks.py
View file

@ -135,6 +135,7 @@ class LdapLockHolder:
tomber. tomber.
""" """
try: try:
value = str(value)
host, pid, begin = self.getlock(item, value) host, pid, begin = self.getlock(item, value)
time_left = self.timeout - (time.time() - begin) time_left = self.timeout - (time.time() - begin)
if time_left <= 0: if time_left <= 0:
@ -183,8 +184,9 @@ class LdapLockHolder:
""" """
Libère le lock "$item=$value,$LOCKS_DN". Libère le lock "$item=$value,$LOCKS_DN".
""" """
value = str(value)
try: try:
if force or str(value) in self.locks[Id][item]: if force or value in self.locks[Id][item]:
self.conn.delete_s("%s=%s,%s" % (item, value, LOCKS_DN)) self.conn.delete_s("%s=%s,%s" % (item, value, LOCKS_DN))
except ldap.NO_SUCH_OBJECT: except ldap.NO_SUCH_OBJECT:
pass pass
@ -201,7 +203,7 @@ class LdapLockHolder:
Trouve le lock item=value, et renvoie le contenu de lockinfo Trouve le lock item=value, et renvoie le contenu de lockinfo
via un triplet host, pid, begin via un triplet host, pid, begin
""" """
value = str(value)
try: try:
result = self.conn.search_s('%s=%s,%s' % (item, value, LOCKS_DN), 0) result = self.conn.search_s('%s=%s,%s' % (item, value, LOCKS_DN), 0)
host, pid, begin = result[0][1]['lockid'][0].split('-') host, pid, begin = result[0][1]['lockid'][0].split('-')