Changeset 147

Timestamp:

05/08/02 22:53:36 (6 years ago)

Author:

sholloway

Message:

Learned some new stuff

Files:

• trunk/RBFoundation/RBFoundation/AttributedDict.py (added)
• trunk/RBFoundation/RBFoundation/XMLClassBuilder.py (modified) (1 diff)
• trunk/RBFoundation/RBFoundation/XMLObjectify.py (modified) (7 diffs)
• trunk/RBJabber/RBJabber/SubjectObserver/AttributedSubject.py (modified) (2 diffs)

trunk/RBFoundation/RBFoundation/XMLClassBuilder.py

@@ -68 +68 @@
-        return ('%s.%s' % (namespace, node), node)
-
-
+
+
+
+
+
+
-        ## The previous is another plausable import scheme.  However, 
-        ## I don't care for the directory structure that this creates; but, since 

trunk/RBFoundation/RBFoundation/XMLObjectify.py

@@ -168 +168 @@
-
-    _default_attributes = {}
+    _attributes_casts = {}
- 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -178 +179 @@
-        self._attributes = self._default_attributes.copy()
-        self._attributes.update(attributes)
+
+        for key, cast in self._attributes_casts.iteritems():
+            try: self._attributes[key] = cast(self._attributes[key])
+            except KeyError: pass
+            except ValueError: pass
+ 
-        self._elements = []
-
@@ -189 +196 @@
-            if xmlName in _attributes:
-                return _attributes[xmlName]
-[x[-1] for x in self._elements if x[0][-1] == xmlName]
+self._getElements(xmlName) 
-            if result:
-                return result
@@ -219 +226 @@
-                return
-            else:
-
-
-
+
-                    return
-
@@ -280 +285 @@
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+    def _xmlChildFactory(self, owner, parent, namespace, node, attributes): 
+        """Allows XMLObjectify to work with XMLClassBuilder"""
+        return self.__class__
+
+    def _getElements(self, node):
+        """Returns all elements matching node."""
+        return [x[-1] for x in self._elements if x[0][-1] == node]
+
+    def _delAllElements(self, andData=0):
+        """Removes all elements, and if andData, all PCData as well."""
+        if andData: elements = []
+        else: elements = [x for x in self._elements if x[0][-1] == '']
+
+    def _delElements(self, node):
+        """Removes all elements matching node."""
+        elements = [x for x in self._elements if x[0][-1] != node]
+        if len(elements) != len(self._elements):
+            self._elements = elements
+            return 1
+        return 0
+
-    def _addElement(self, namespace, node, obj):
-        """Adds a subnode obj, that is in namespace, and has name node.  Obj is not necessarily an ObjectifiedXML class, but is required to implement _toXML."""
@@ -303 +329 @@
-    def _clearData(self):
-        """Removes all PCData from the element node."""
-
-
-
+
-
-    def _addData(self, data):
@@ -312 +336 @@
-
-    def _setData(self, data):
-Adds
+Clears PCData, then appends new
-        self._clearData()
-        self._addData(data)
+
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-

trunk/RBJabber/RBJabber/SubjectObserver/AttributedSubject.py

@@ -42 +42 @@
-
-class AttributedSubjectMixin(object):
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Special 
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
-    def __init__(self, *args, **kw):
-        apply(super(AttributedSubjectMixin, self).__init__, args, kw)
@@ -68 +72 @@
-            return super(AttributedSubjectMixin, self).__delattr__(name)
-
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~ Dictonary Compatability
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    def __contains__(self): 
+        return self._attributes.__contains__()
+
+    def __iter__(self): 
+        return self._attributes.__iter__()
+
+    def __str__(self): 
+        return self._attributes.__str__()
+
+    def __repr__(self): 
+        return self._attributes.__repr__()
+
+    def __getitem__(self, *args, **kw): 
+        return apply(self._attributes.__getitem__, args, kw)
+
+    def __setitem__(self, *args, **kw): 
+        return apply(self._attributes.__setitem__, args, kw)
+
+    def __delitem__(self, *args, **kw): 
+        return apply(self._attributes.__delitem__, args, kw)
+
+    def __hash__(self):
+        return  self._attributes.__hash__()
+
+    def clear(self): 
+        return self._attributes.clear()
+
+    def copy(self): 
+        return self._attributes.copy()
+
+    def get(self, *args, **kw): 
+        return apply(self._attributes.get, args, kw)
+
+    def has_key(self, *args, **kw): 
+        return apply(self._attributes.has_key, args, kw)
+
+    def popitem(self, *args, **kw): 
+        return apply(self._attributes.popitem, args, kw)
+
+    def setdefault(self, *args, **kw): 
+        return apply(self._attributes.setdefault, args, kw)
+
+    def update(self, *args, **kw): 
+        return apply(self._attributes.update, args, kw)
+
+    def keys(self): 
+        return self._attributes.keys()
+
+    def values(self): 
+        return self._attributes.values()
+
+    def items(self): 
+        return self._attributes.items()
+
+    def iterkeys(self): 
+        return self._attributes.iterkeys()
+
+    def itervalues(self): 
+        return self._attributes.itervalues()
+
+    def iteritems(self): 
+        return self._attributes.iteritems()
+
+
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-