comparison idavoll/memory_storage.py @ 148:b03e5ad81173

Change all calls to jid.JID to jid.internJID to avoid redoing stringprep.
author Ralph Meijer <ralphm@ik.nu>
date Wed, 31 Aug 2005 12:58:50 +0000
parents b4490bdc77e5
children 5191ba7c4df8
comparison
equal deleted inserted replaced
147:fee92e499d6d 148:b03e5ad81173
56 56
57 def get_subscriptions(self, entity): 57 def get_subscriptions(self, entity):
58 subscriptions = [] 58 subscriptions = []
59 for node in self._nodes.itervalues(): 59 for node in self._nodes.itervalues():
60 for subscriber, subscription in node._subscriptions.iteritems(): 60 for subscriber, subscription in node._subscriptions.iteritems():
61 subscriber = jid.JID(subscriber) 61 subscriber = jid.internJID(subscriber)
62 if subscriber.userhostJID() == entity.userhostJID(): 62 if subscriber.userhostJID() == entity.userhostJID():
63 subscriptions.append((node.id, subscriber, 63 subscriptions.append((node.id, subscriber,
64 subscription.state)) 64 subscription.state))
65 65
66 return defer.succeed(subscriptions) 66 return defer.succeed(subscriptions)
120 return defer.fail(storage.SubscriptionNotFound()) 120 return defer.fail(storage.SubscriptionNotFound())
121 121
122 return defer.succeed(None) 122 return defer.succeed(None)
123 123
124 def get_subscribers(self): 124 def get_subscribers(self):
125 subscribers = [jid.JID(subscriber) for subscriber, subscription 125 subscribers = [jid.internJID(subscriber) for subscriber, subscription
126 in self._subscriptions.iteritems() 126 in self._subscriptions.iteritems()
127 if subscription.state == 'subscribed'] 127 if subscription.state == 'subscribed']
128 128
129 return defer.succeed(subscribers) 129 return defer.succeed(subscribers)
130 130
131 def is_subscribed(self, entity): 131 def is_subscribed(self, entity):
132 for subscriber, subscription in self._subscriptions.iteritems(): 132 for subscriber, subscription in self._subscriptions.iteritems():
133 if jid.JID(subscriber).userhost() == entity.userhost() and \ 133 if jid.internJID(subscriber).userhost() == entity.userhost() and \
134 subscription.state == 'subscribed': 134 subscription.state == 'subscribed':
135 return defer.succeed(True) 135 return defer.succeed(True)
136 136
137 return defer.succeed(False) 137 return defer.succeed(False)
138 138
139 def get_affiliations(self): 139 def get_affiliations(self):
140 affiliations = [(jid.JID(entity), affiliation) for entity, affiliation 140 affiliations = [(jid.internJID(entity), affiliation) for entity, affiliation
141 in self._affiliations.iteritems()] 141 in self._affiliations.iteritems()]
142 142
143 return defer.succeed(affiliations) 143 return defer.succeed(affiliations)
144 144
145 class LeafNodeMixin: 145 class LeafNodeMixin: