Changeset 551

Timestamp:

06/10/03 16:03:19 (5 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBFoundation/RBFoundation/Objects/Relations.py (modified) (2 diffs)
• trunk/RBFoundation/RBFoundation/SubObs/Interface/PublishProperty.py (deleted)
• trunk/RBFoundation/RBFoundation/Utilities.py (modified) (1 diff)

trunk/RBFoundation/RBFoundation/Objects/Relations.py

@@ -193 +193 @@
-        return self.itervalues()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if self.keyname is None:
-            raise ValueError, 'Cannot infer key for relation "%s"' % (relation,)
@@ -205 +227 @@
-                else:
-                    raise KeyError, 'Relation "%s" metadata has no key "%s"' % (relation, self.keyname)
-
-    def add(self, *relations): 
-        relations = _flattenlist(relations)
-        relations = self.getkeypairs(relations)
-        self.OnModifying(self, relations)
-        self.lookup.update(relations)
-        self.OnModified(self, relations)
-
-    def remove(self, *relation):
-        relations = _flattenlist(relations)
-        relations = self.getkeypairs(relations)
-        self.OnModifying(self, relations)
-        for key, relation in relations:
-            try: del self.lookup[key]
-            except LookupError: continue
-        self.OnModified(self, relations)
-
-    def clear(self):
-        relations = self.lookup.items()
-        self.OnModifying(self, relations)
-        self.lookup.clear()
-        self.OnModified(self, relations)
-
-    #~ dict adapter ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBFoundation/RBFoundation/Utilities.py

@@ -23 +23 @@
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~ Imports 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+import types
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~ Constants / Variables / Etc. 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+_collectiontypes = (list, tuple, types.GeneratorType)
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#~ Definitions 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+def isIterable(item):
+    if isinstance(item, _collectiontypes):
+        return True
+    elif hasattr(item, '__iter__'):
+        return True
+    else:
+        return False
+
+def asIterable(item):
+    if isinstance(item, _collectiontypes):
+        return item
+    elif hasattr(item, '__iter__'):
+        return item
+    else: 
+        return [item]
+
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-