diff idavoll/memory_backend.py @ 59:0fa161c00ed9

Use jid.JIDs everywhere in the backend. Fix subscription list retrieval in pgsql_backend, thereby actually making notifications work.
author Ralph Meijer <ralphm@ik.nu>
date Sat, 06 Nov 2004 17:07:47 +0000
parents 62fdb37234e5
children 0e642e5b4fb2
line wrap: on
line diff
--- a/idavoll/memory_backend.py	Sat Nov 06 16:02:32 2004 +0000
+++ b/idavoll/memory_backend.py	Sat Nov 06 17:07:47 2004 +0000
@@ -49,7 +49,7 @@
         except KeyError:
             raise backend.NodeNotFound
         else:
-            return defer.succeed(node.affiliations.get(entity, None))
+            return defer.succeed(node.affiliations.get(entity.full(), None))
 
     def get_subscribers(self, node_id):
         try:
@@ -58,7 +58,7 @@
             raise backend.NodeNotFound
         else:
             subscriptions = self.nodes[node_id].subscriptions
-            subscribers = [s for s in subscriptions
+            subscribers = [jid.JID(s) for s in subscriptions
                              if subscriptions[s].state == 'subscribed']
             return defer.succeed(subscribers)
 
@@ -74,10 +74,10 @@
             raise backend.NodeNotFound
 
         try:
-            subscription = node.subscriptions[subscriber]
+            subscription = node.subscriptions[subscriber.full()]
         except:
             subscription = Subscription(state)
-            node.subscriptions[subscriber] = subscription
+            node.subscriptions[subscriber.full()] = subscription
 
         return defer.succeed({'node': node_id,
                               'jid': subscriber,
@@ -90,7 +90,7 @@
             raise backend.NodeNotFound
 
         try:
-            del node.subscriptions[subscriber]
+            del node.subscriptions[subscriber.full()]
         except KeyError:
             raise backend.NotSubscribed
 
@@ -101,7 +101,7 @@
             raise backend.NodeExists
     
         node = Node(node_id)
-        node.affiliations[owner] = 'owner'
+        node.affiliations[owner.full()] = 'owner'
         self.nodes[node_id] = node
 
         return defer.succeed(None)