Changeset 10:a5e3c32d23ca for wokkel/pubsub.py

Timestamp:

Jan 3, 2008, 10:58:54 AM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

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

Message:

Add unsubscribe method to PubSubClient?.

Author: ralphm
Fixes #4.

File:

• wokkel/pubsub.py (modified) (10 diffs)

wokkel/pubsub.py

@@ -1 +1 @@
 # -*- test-case-name: wokkel.test.test_pubsub -*-
 #
-# Copyright (c) 2003-2007 Ralph Meijer
+# Copyright (c) 2003-2008 Ralph Meijer
 # See LICENSE for details.
 
@@ -78 +78 @@
 
 
-
 class SubscriptionPending(Exception):
     """
@@ -146 +145 @@
                 self.addChild(payload)
 
+
 class PubSubRequest(xmlstream.IQ):
     """
@@ -168 +168 @@
 
     def send(self, to):
-        destination = unicode(to)
+        """
+        Send out request.
+
+        Extends L{xmlstream.IQ.send} by requiring the C{to} parameter to be
+        a L{JID} instance.
+
+        @param to: Entity to send the request to.
+        @type to: L{JID}
+        """
+        destination = to.full()
         return xmlstream.IQ.send(self, destination)
+
 
 class CreateNode(PubSubRequest):
@@ -178 +188 @@
         if node:
             self.command["node"] = node
+
 
 class DeleteNode(PubSubRequest):
@@ -185 +196 @@
         self.command["node"] = node
 
+
 class Subscribe(PubSubRequest):
     verb = 'subscribe'
@@ -193 +205 @@
         self.command["jid"] = subscriber.full()
 
+
+class Unsubscribe(PubSubRequest):
+    verb = 'unsubscribe'
+
+    def __init__(self, xs, node, subscriber):
+        PubSubRequest.__init__(self, xs)
+        self.command["node"] = node
+        self.command["jid"] = subscriber.full()
+
+
 class Publish(PubSubRequest):
     verb = 'publish'
@@ -208 +230 @@
 
         return item
+
 
 class PubSubClient(XMPPHandler):
@@ -270 +293 @@
         return request.send(service).addCallback(cb)
 
+    def unsubscribe(self, service, nodeIdentifier, subscriber):
+        request = Unsubscribe(self.xmlstream, nodeIdentifier, subscriber)
+        return request.send(service)
+
     def publish(self, service, nodeIdentifier, items=[]):
         request = Publish(self.xmlstream, nodeIdentifier)
@@ -276 +303 @@
 
         return request.send(service)
+
 
 class PubSubService(XMPPHandler, IQHandlerMixin):