Changeset 62:b98e610f62cc

Timestamp:

Jul 6, 2009, 9:24:58 AM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@174

Message:

Add sender parameter to disco requests.

Author: ralphm
Fixes #52.

Location:

wokkel

Files:

• disco.py (modified) (4 diffs)
• test/test_disco.py (modified) (2 diffs)

wokkel/disco.py

@@ -374 +374 @@
     """
 
-    def requestInfo(self, entity, nodeIdentifier=''):
+    def requestInfo(self, entity, nodeIdentifier='', sender=None):
         """
         Request information discovery from a node.
@@ -380 +380 @@
         @param entity: Entity to send the request to.
         @type entity: L{jid.JID}
+
         @param nodeIdentifier: Optional node to request info from.
         @type nodeIdentifier: C{unicode}
+
+        @param sender: Optional sender address.
+        @type sender: L{jid.JID}
         """
 
         request = _DiscoRequest(self.xmlstream, NS_DISCO_INFO, nodeIdentifier)
+        if sender is not None:
+            request['from'] = unicode(sender)
 
         d = request.send(entity.full())
@@ -391 +397 @@
 
 
-    def requestItems(self, entity, nodeIdentifier=''):
+    def requestItems(self, entity, nodeIdentifier='', sender=None):
         """
         Request items discovery from a node.
@@ -397 +403 @@
         @param entity: Entity to send the request to.
         @type entity: L{jid.JID}
+
         @param nodeIdentifier: Optional node to request info from.
         @type nodeIdentifier: C{unicode}
+
+        @param sender: Optional sender address.
+        @type sender: L{jid.JID}
         """
 
         request = _DiscoRequest(self.xmlstream, NS_DISCO_ITEMS, nodeIdentifier)
+        if sender is not None:
+            request['from'] = unicode(sender)
 
         d = request.send(entity.full())

wokkel/test/test_disco.py

@@ -515 +515 @@
 
 
+    def test_requestItemsFrom(self):
+        """
+        A disco items request can be sent with an explicit sender address.
+        """
+        d = self.protocol.requestItems(JID(u'example.org'),
+                                       sender=JID(u'test.example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEqual(u'test.example.org', iq.getAttribute(u'from'))
+
+        response = toResponse(iq, u'result')
+        query = response.addElement((NS_DISCO_ITEMS, u'query'))
+        self.stub.send(response)
+
+        return d
+
+
     def test_requestInfo(self):
         """
@@ -550 +567 @@
 
         self.stub.send(response)
+        return d
+
+
+    def test_requestInfoFrom(self):
+        """
+        A disco info request can be sent with an explicit sender address.
+        """
+        d = self.protocol.requestInfo(JID(u'example.org'),
+                                       sender=JID(u'test.example.org'))
+
+        iq = self.stub.output[-1]
+        print iq.toXml()
+        self.assertEqual(u'test.example.org', iq.getAttribute(u'from'))
+
+        response = toResponse(iq, u'result')
+        query = response.addElement((NS_DISCO_INFO, u'query'))
+        self.stub.send(response)
+
         return d