From ba260bcb501d0104cdb15aac9e8150e1272920ff Mon Sep 17 00:00:00 2001 From: Olivier Iffrig Date: Sun, 27 Feb 2011 01:07:04 +0100 Subject: [PATCH] [attributs, lc_ldap] unicode(x) -> x.__unicode__() --- attributs.py | 2 +- lc_ldap.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/attributs.py b/attributs.py index 089ae12..07ba21b 100644 --- a/attributs.py +++ b/attributs.py @@ -81,7 +81,7 @@ class Attr(object): self.value = val def __str__(self): - return unicode(self).encode('utf-8') + return self.__unicode__().encode('utf-8') def __unicode__(self): # XXX - Vérifier que cette méthode produit un objet parsable diff --git a/lc_ldap.py b/lc_ldap.py index 753cdb3..ae48ad7 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -329,9 +329,9 @@ class CransLdapObject(object): def __getitem__(self, attr): if self.mode in [ 'w', 'rw' ]: - return [ unicode(v) for v in self._modifs[attr] ] + return [ v.__unicode__() for v in self._modifs[attr] ] else: - return [ unicode(v) for v in self.attrs[attr] ] + return [ v.__unicode__() for v in self.attrs[attr] ] def __setitem__(self, attr, values): if self.mode not in ['w', 'rw']: