Author: jmorliaguet
Date: Mon Mar 27 21:23:19 2006
New Revision: 2737

Modified:
   cpsskins/branches/jmo-perspectives/io/README.txt
   cpsskins/branches/jmo-perspectives/relations/storage.py
Log:

- using unicode() instead of str()



Modified: cpsskins/branches/jmo-perspectives/io/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/README.txt    (original)
+++ cpsskins/branches/jmo-perspectives/io/README.txt    Mon Mar 27 21:23:19 2006
@@ -140,8 +140,8 @@
     >>> ztapi.provideAdapter(IElement, IRelatable, Relatable)
 
     >>> resource = Style()
-    >>> str(IRelatable(resource))
-    '12345'
+    >>> unicode(IRelatable(resource))
+    u'12345'
 
 For instance a portlet will be uniformally identified as:
 

Modified: cpsskins/branches/jmo-perspectives/relations/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/relations/storage.py     (original)
+++ cpsskins/branches/jmo-perspectives/relations/storage.py     Mon Mar 27 
21:23:19 2006
@@ -231,7 +231,7 @@
         """Choose a name and add the relation to the store.
         """
         chooser = INameChooser(self)
-        name = str(relation).replace('_', '').replace(' ', '')
+        name = unicode(relation).replace('_', '').replace(' ', '')
         relation_name = chooser.chooseName(name, relation)
         self[relation_name] = relation
         logger.debug("Added a relation '%s': '%s'", relation_name,
@@ -289,7 +289,7 @@
         def f(v, w):
             if w == '*':
                 return '*'
-            return str(IRelatable(v, v))
+            return unicode(IRelatable(v, v))
 
         for w in WILDCARDS[arity]:
             relations.append(
@@ -304,7 +304,7 @@
         def f(v):
             if v is None:
                 return '*'
-            return str(IRelatable(v, v))
+            return unicode(IRelatable(v, v))
         return ','.join([f(r) for r in relates])
 
     def _lookup(self, relates):
@@ -348,7 +348,7 @@
                 "At least one relate must be specified in the query"
 
         result = self._lookup(relates)
-        return [r for r in result if str(self.get(r)) in predicate]
+        return [r for r in result if unicode(self.get(r)) in predicate]
 
     def _getRelate(self, position, **kw):
         relates = []
@@ -379,7 +379,7 @@
         if not IPredicate.providedBy(predicate):
             raise TypeError, "This type of predicate is not supported."
 
-        return [r for r in self if str(self.get(r)) in predicate]
+        return [r for r in self if unicode(self.get(r)) in predicate]
 
     def clear(self):
         """Remove all relations from the storage.
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to