Changeset 135
- Timestamp:
- 05/01/02 12:21:07 (6 years ago)
- Files:
-
- trunk/RBJabber/RBJabber/Client.py (modified) (2 diffs)
- trunk/RBJabber/RBJabber/TestInteractive.py (added)
- trunk/RBJabber/RBJabber/iqAuthQuery.py (modified) (1 diff)
- trunk/RBJabber/RBJabber/iqQuery.py (modified) (2 diffs)
- trunk/RBJabber/RBJabber/iqResponse.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBJabber/RBJabber/Client.py
r130 r135 153 153 return query 154 154 155 def SetPrivateData(self, xml): 156 return self.SetData('jabber:iq:private', xml) 157 155 158 def SetData(self, namespace, xml): 156 self.SendXML('''<iq id='%s' type='set'><query xmlns='%s'>%s</query></iq> ''' % (self._GetNextID(), namespace, xml))159 return self.SendXML('''<iq id='%s' type='set'><query xmlns='%s'>%s</query></iq> ''' % (self._GetNextID(), namespace, xml)) 157 160 161 def GetPrivateData(self, callback=None, xml=''): 162 return self.GetData('jabber:iq:private', callback, xml) 163 158 164 def GetData(self, namespace, callback=None, xml=''): 159 165 return self.Query(namespace, '', callback, xml) … … 162 168 import iqQuery 163 169 query = iqQuery.iqQuery(self, callback) 164 query.SendQuery(namespace, toJID )170 query.SendQuery(namespace, toJID, xml=xml) 165 171 return query 166 172 trunk/RBJabber/RBJabber/iqAuthQuery.py
r105 r135 57 57 xmlAuthInfo = '<username>%s</username><digest>%s</digest><resource>%s</resource>' % (username, digest, resource) 58 58 59 self.SendQuery('jabber:iq:auth', type Query='set', xmlQueryPayload=xmlAuthInfo)59 self.SendQuery('jabber:iq:auth', type='set', xml=xmlAuthInfo) 60 60 # The last match assertion says that there is a child 61 61 # in the jabber:iq:auth namespace, which there won't be. trunk/RBJabber/RBJabber/iqQuery.py
r106 r135 53 53 self.JC().stream.AddObserver('iq', self) 54 54 55 def SendQuery(self, n sQuery, jidQuery='', typeQuery='get', xmlQueryPayload='', idQuery=None, bSetLink=1):55 def SendQuery(self, namespace, jid='', type='get', xml='', idQuery=None, bSetLink=1): 56 56 # Get a new id 57 57 idQuery = idQuery or self.JC()._GetNextID() … … 59 59 # Setup our match attributes 60 60 del self.Match[:] 61 if jid Query: self.Match.append(JObs.MatchAttributes(from_=JID.JID(jidQuery)))61 if jid: self.Match.append(JObs.MatchAttributes(from_=JID.JID(jid))) 62 62 if idQuery: self.Match.append(JObs.MatchAttributes(id=idQuery)) 63 self.Match.append(JObs.MatchHasChildNamespace(n sQuery))63 self.Match.append(JObs.MatchHasChildNamespace(namespace)) 64 64 65 65 # and finally send the query 66 self.JC().SendXML(self._BuildQuery(n sQuery, xmlQueryPayload, type=typeQuery, id=idQuery, to=jidQuery))66 self.JC().SendXML(self._BuildQuery(namespace, xml, type=type, id=idQuery, to=jid)) 67 67 return self 68 68 69 def _BuildQuery(self, n sQuery, xmlQueryPayload, **attrQuery):69 def _BuildQuery(self, namespace, xml, **attrQuery): 70 70 # Build the XML attribute string 71 71 strAttributes = ' '.join([ ('%s=%s' % (a[0], quoteattr(a[1]))) for a in attrQuery.iteritems() if a[1]] ) 72 72 # Return the built xml 73 return '''<iq %s ><query xmlns=%s>%s</query></iq>''' % (strAttributes, quoteattr(n sQuery), xmlQueryPayload)73 return '''<iq %s ><query xmlns=%s>%s</query></iq>''' % (strAttributes, quoteattr(namespace), xml) 74 74 75 75 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ trunk/RBJabber/RBJabber/iqResponse.py
r96 r135 53 53 self.JC().stream.AddObserver('iq', self) 54 54 55 def AnswerQuery(self, ns Query, typeQuery='get'):55 def AnswerQuery(self, ns, type='get'): 56 56 # Lets observer the jabber stream 57 if ns Querynot in self.JC().SupportedNS:58 self.JC().SupportedNS.append(ns Query)57 if ns not in self.JC().SupportedNS: 58 self.JC().SupportedNS.append(ns) 59 59 60 60 del self.Match[:] 61 self.Match.append(JObs.MatchHasChildNamespace(ns Query))62 self.Match.append(JObs.MatchAttributes(type=type Query))61 self.Match.append(JObs.MatchHasChildNamespace(ns)) 62 self.Match.append(JObs.MatchAttributes(type=type)) 63 63 64 64 # Setup our match attributes
