# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1304062410 -7200
# Node ID eb73ce823622c80b4104c7c7c784ddd2b369b99b
# Parent  5a1e9b90b5c4f4c7f1c9b1640337d172ec48b2b7
[facets] proper fix for #1625112: we should rather call unicode() as we always manipulate string as unicode internally

diff -r 5a1e9b90b5c4 -r eb73ce823622 web/facet.py
--- a/web/facet.py	Thu Apr 28 15:29:21 2011 +0200
+++ b/web/facet.py	Fri Apr 29 09:33:30 2011 +0200
@@ -451,11 +451,6 @@
         return False
 
 
-def encode(obj, encoding):
-    if isinstance(obj, unicode):
-        return obj.encode(encoding)
-    return unicode(obj).encode(encoding)
-
 class RelationFacet(VocabularyFacet):
     """Base facet to filter some entities according to other entities to which
     they are related. Create concret facet by inheriting from this class an then
@@ -610,8 +605,7 @@
                 insert_attr_select_relation(
                     rqlst, self.filtered_variable, self.rtype, self.role, self.target_attr,
                     select_target_entity=False)
-            encoding = self._cw.encoding
-            values = [encode(x, encoding) for x, in self.rqlexec(rqlst.as_string())]
+            values = [unicode(x) for x, in self.rqlexec(rqlst.as_string())]
         except:
             self.exception('while computing values for %s', self)
             return []