Changeset 3606

Timestamp:

10/23/07 16:45:00 (1 year ago)

Author:

pobrien

Message:

Better string and unicode representations. Needs unit tests.

Files:

• trunk/Schevo/schevo/field.py (modified) (3 diffs)

trunk/Schevo/schevo/field.py

@@ -1268 +1268 @@
-    allow_unassigned = False
-
+    def __str__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return '<UNASSIGNED>'
+        else:
+            return ', '.join(str(item) for item in v)
+
+    def __unicode__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return u'<UNASSIGNED>'
+        else:
+            return u', '.join(unicode(item) for item in v)
+
-    def convert(self, value, db=None):
-        if isinstance(value, (list, tuple)):
@@ -1424 +1438 @@
-    """Set of Entity instances field class."""
-
+    def __str__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return '<UNASSIGNED>'
+        else:
+            return ', '.join(str(item) for item in v)
+
+    def __unicode__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return u'<UNASSIGNED>'
+        else:
+            return u', '.join(unicode(item) for item in v)
+
-    def convert(self, value, db=None):
-        if isinstance(value, (set, frozenset)):
@@ -1513 +1541 @@
-class EntitySetSet(_EntityBase):
-    """Set of EntitySet instances field class."""
+
+    def __str__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return '<UNASSIGNED>'
+        else:
+            return '; '.join(', '.join(str(item) for item in items)
+                             for items in v)
+
+    def __unicode__(self):
+        v = self.get()
+        if v is UNASSIGNED:
+            return u'<UNASSIGNED>'
+        else:
+            return '; '.join(u', '.join(unicode(item) for item in items)
+                             for items in v)
-
-    def convert(self, value, db=None):