Changeset 137
- Timestamp:
- 05/05/02 10:13:55 (6 years ago)
- Files:
-
- trunk/RBFoundation/RBFoundation/XMLObjectify.py (modified) (3 diffs)
- trunk/RBJabber/RBJabber/Client.py (modified) (2 diffs)
- trunk/RBJabber/RBJabber/Conference.py (added)
- trunk/RBJabber/RBJabber/JabberSubject.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/MessageRouter.py (modified) (3 diffs)
- trunk/RBJabber/RBJabber/SubjectObserver/CategorySubject.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/SubjectObserver/Subject.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/SubjectObserver/__init__.py (modified) (1 diff)
- trunk/RBSkinning/RBSkinning/wxTools/wxEvtHandlerBidableCategorySubject.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBFoundation/RBFoundation/XMLObjectify.py
r133 r137 183 183 """Allows for the node.attribute or node.subnode semantics""" 184 184 if '_' != name[0]: 185 _attributes = self._attributes 186 if name in self._attributes: return _attributes[name] 185 187 xmlName = name.replace('_', '-') 186 188 if '-' == xmlName[-1]: xmlName = xmlName[:-1] 187 _attributes = self._attributes188 189 if xmlName in _attributes: 189 190 return _attributes[xmlName] … … 196 197 """Allows user to create new attributes, or change values using node.attribute semantics""" 197 198 if '_' != name[0:1]: 198 xmlName = name.replace('_', '-') 199 if '-' == xmlName[-1]: xmlName = xmlName[:-1] 200 self._attributes[xmlName] = value 199 if name in self._attributes: 200 self._attributes[name] = value 201 else: 202 xmlName = name.replace('_', '-') 203 if '-' == xmlName[-1]: xmlName = xmlName[:-1] 204 self._attributes[xmlName] = value 201 205 else: 202 206 return XMLBuilder.XMLBuilderObjectBase.__setattr__(self, name, value) … … 205 209 """Allows for deletion of attributes or subnodes through node.attribute or node.subnode semantics""" 206 210 if '_' != name[0:1]: 211 if name in self._attributes: 212 del self._attributes[name] 213 return 214 207 215 xmlName = name.replace('_', '-') 208 216 if '-' == xmlName[-1]: xmlName = xmlName[:-1] trunk/RBJabber/RBJabber/Client.py
r135 r137 165 165 return self.Query(namespace, '', callback, xml) 166 166 167 def Query(self, namespace, toJID='', callback=None, xml=''):167 def Query(self, namespace, toJID='', type='get', callback=None, xml=''): 168 168 import iqQuery 169 169 query = iqQuery.iqQuery(self, callback) 170 query.SendQuery(namespace, toJID, xml=xml)170 query.SendQuery(namespace, toJID, type=type, xml=xml) 171 171 return query 172 172 … … 190 190 def Presence(self, toJID='', status='', show='', type='available', xml=''): 191 191 idPresence = self._GetNextID() 192 strXML = '<presence id=%s type=%s ' % (quoteattr(idPresence), quoteattr(type)) 192 strXML = '<presence id=%s ' % quoteattr(idPresence) 193 if type: strXML += 'type=%s ' % quoteattr(type) 193 194 if toJID: strXML += 'to=%s ' % quoteattr(toJID) 194 195 strXML += '>' trunk/RBJabber/RBJabber/JabberSubject.py
r111 r137 49 49 50 50 class FromJIDSubjectMixin(JabberSubjectBase): 51 def AddObserver(self, category, observer , bUpdate=0):52 super(FromJIDSubjectMixin, self).AddObserver(JID.JID(category), observer , bUpdate)51 def AddObserver(self, category, observer): 52 super(FromJIDSubjectMixin, self).AddObserver(JID.JID(category), observer) 53 53 54 def RemoveObserver(self, category, observer , bUpdate=0):55 super(FromJIDSubjectMixin, self).RemoveObserver(JID.JID(category), observer , bUpdate)54 def RemoveObserver(self, category, observer): 55 super(FromJIDSubjectMixin, self).RemoveObserver(JID.JID(category), observer) 56 56 57 57 def _ProxyObserverList(self, category): 58 58 result = [] 59 result.extend(self._ObserverList(category .from_.noresource()))60 result.extend(self._ObserverList(category .from_))59 result.extend(self._ObserverList(category[1].from_.noresource())) 60 result.extend(self._ObserverList(category[1].from_)) 61 61 result.extend(super(FromJIDSubjectMixin, self)._ProxyObserverList(category)) 62 62 trunk/RBJabber/RBJabber/MessageRouter.py
r104 r137 53 53 def _ProxyObserverList(self, category): 54 54 result = [] 55 result.extend(self._ObserverList( value.type))55 result.extend(self._ObserverList(category[1].type)) 56 56 result.extend(super(MessageRouterByType, self)._ProxyObserverList(category)) 57 57 return result … … 65 65 def _ProxyObserverList(self, category): 66 66 result = [] 67 result.extend(self._ObserverList( value.id))67 result.extend(self._ObserverList(category[1].id)) 68 68 result.extend(super(MessageRouterByType, self)._ProxyObserverList(category)) 69 69 return result … … 82 82 def _ProxyObserverList(self, category): 83 83 result = [] 84 thread = ':'.join(map(str, value.Elements(value='thread')))84 thread = ':'.join(map(str, category[1].Elements(value='thread'))) 85 85 result.extend(self._ObserverList(thread)) 86 86 result.extend(super(MessageRouterByThread, self)._ProxyObserverList(category)) trunk/RBJabber/RBJabber/SubjectObserver/CategorySubject.py
r95 r137 51 51 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 52 52 53 def AddObserver(self, category, observer , bUpdate=0):53 def AddObserver(self, category, observer): 54 54 result = WeakBind.BindCallable(observer) 55 55 self._observers.setdefault(category,[]).append(result) 56 if bUpdate: self.UpdateObserver(result, self._cachedUpdates)57 56 return self 58 57 trunk/RBJabber/RBJabber/SubjectObserver/Subject.py
r107 r137 51 51 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 52 52 53 def AddObserver(self, observer , bUpdate=0):53 def AddObserver(self, observer): 54 54 result = WeakBind.BindCallable(observer) 55 55 self._observers.append(result) 56 if bUpdate: self.UpdateObserver(result, self._cachedUpdates)57 56 return self 58 57 trunk/RBJabber/RBJabber/SubjectObserver/__init__.py
r131 r137 66 66 67 67 def _ProxyObserverList(self, category): 68 return self._ObserverList(category )68 return self._ObserverList(category[0]) 69 69 70 70 def Bid(self, subject, **UpdateDict): 71 for value in UpdateDict.iter values():71 for value in UpdateDict.iteritems(): 72 72 for obs in self._ProxyObserverList(value): 73 73 subject._GetBid(obs, UpdateDict) trunk/RBSkinning/RBSkinning/wxTools/wxEvtHandlerBidableCategorySubject.py
r71 r137 52 52 evt.Skip() 53 53 54 def AddObserver(self, category, observer , bUpdate=0):54 def AddObserver(self, category, observer): 55 55 self.EvtHandler.Connect(-1, -1, category, BindCallable(self._OnEvent)) 56 BidableCategorySubject.AddObserver(self, ('event', category), observer , bUpdate=0)56 BidableCategorySubject.AddObserver(self, ('event', category), observer) 57 57
