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

[lc_ldap] search_historique renvoie une liste d'unicode

Browse source
This commit is contained in:
Olivier Iffrig 2010-11-30 20:46:16 +01:00
parent b968849d51
commit ffb51cc255
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lc_ldap.py
View file

@ -341,10 +341,11 @@ class CransLdapObject(object):
for cn, attrs in res: for cn, attrs in res:
date = crans_utils.format_ldap_time(attrs['reqEnd'][0]) date = crans_utils.format_ldap_time(attrs['reqEnd'][0])
if attrs['reqType'][0] == 'delete': if attrs['reqType'][0] == 'delete':
out.append("%s : [%s] Suppression" % (date, attrs['reqAuthzID'][0])) out.append(u"%s : [%s] Suppression" % (date, attrs['reqAuthzID'][0].decode('utf-8')))
elif attrs['reqType'][0] == 'modify': elif attrs['reqType'][0] == 'modify':
fields = {} fields = {}
for mod in attrs['reqMod']: for mod in attrs['reqMod']:
mod = mod.decode('utf-8')
field, change = mod.split(':', 1) field, change = mod.split(':', 1)
if field not in ign_fields: if field not in ign_fields:
if field in fields: if field in fields:
@ -354,9 +355,9 @@ class CransLdapObject(object):
mod_list = [] mod_list = []
for field in fields: for field in fields:
mods = fields[field] mods = fields[field]
mod_list.append("%s %s" %(field, ", ".join(mods))) mod_list.append(u"%s %s" %(field, ", ".join(mods)))
if mod_list != []: if mod_list != []:
out.append("%s : [%s] %s" % (date, attrs['reqAuthzID'][0], " ; ".join(mod_list))) out.append(u"%s : [%s] %s" % (date, attrs['reqAuthzID'][0].decode('utf-8'), " ; ".join(mod_list)))
return out return out
def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'): def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):