Changeset 133:2ea562934152 for wokkel

Timestamp:

Oct 23, 2009, 9:07:21 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Parents:

132:1b19c49d30c2 (diff), 73:b0340948d17f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge in trunk changes.

File:

• wokkel/disco.py (modified) (9 diffs)

wokkel/disco.py

@@ -12 +12 @@
 
 from twisted.internet import defer
-from twisted.words.protocols.jabber import error, jid, xmlstream
+from twisted.words.protocols.jabber import error, jid
 from twisted.words.xish import domish
 
 from wokkel import data_form
+from wokkel.compat import IQ
 from wokkel.iwokkel import IDisco
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
@@ -346 +347 @@
 
 
-class _DiscoRequest(xmlstream.IQ):
+class _DiscoRequest(IQ):
     """
     Element representing an XMPP service discovery request.
@@ -362 +363 @@
         @type nodeIdentifier: C{unicode}
         """
-        xmlstream.IQ.__init__(self, xs, "get")
+        IQ.__init__(self, xs, "get")
         query = self.addElement((namespace, 'query'))
         if nodeIdentifier:
@@ -374 +375 @@
     """
 
-    def requestInfo(self, entity, nodeIdentifier=''):
+    def requestInfo(self, entity, nodeIdentifier='', sender=None):
         """
         Request information discovery from a node.
@@ -380 +381 @@
         @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 +398 @@
 
 
-    def requestItems(self, entity, nodeIdentifier=''):
+    def requestItems(self, entity, nodeIdentifier='', sender=None):
         """
         Request items discovery from a node.
@@ -397 +404 @@
         @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())
@@ -526 +539 @@
         @rtype: L{defer.Deferred}
         """
-        dl = [handler.getDiscoInfo(requestor, target, nodeIdentifier)
+        dl = [defer.maybeDeferred(handler.getDiscoInfo, requestor, target,
+                                                        nodeIdentifier)
               for handler in self.parent
               if IDisco.providedBy(handler)]
@@ -548 +562 @@
         @rtype: L{defer.Deferred}
         """
-        dl = [handler.getDiscoItems(requestor, target, nodeIdentifier)
+        dl = [defer.maybeDeferred(handler.getDiscoItems, requestor, target,
+                                                         nodeIdentifier)
               for handler in self.parent
               if IDisco.providedBy(handler)]