From ffb51cc255a1d9bd6221240604a82b5d0ccab5ea Mon Sep 17 00:00:00 2001 From: Olivier Iffrig Date: Tue, 30 Nov 2010 20:46:16 +0100 Subject: [PATCH] [lc_ldap] search_historique renvoie une liste d'unicode --- lc_ldap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lc_ldap.py b/lc_ldap.py index 3f9f323..75bdc58 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -341,10 +341,11 @@ class CransLdapObject(object): for cn, attrs in res: date = crans_utils.format_ldap_time(attrs['reqEnd'][0]) 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': fields = {} for mod in attrs['reqMod']: + mod = mod.decode('utf-8') field, change = mod.split(':', 1) if field not in ign_fields: if field in fields: @@ -354,9 +355,9 @@ class CransLdapObject(object): mod_list = [] for field in fields: mods = fields[field] - mod_list.append("%s %s" %(field, ", ".join(mods))) + mod_list.append(u"%s %s" %(field, ", ".join(mods))) 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 def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):