erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tmp (rsm): better use of domish.Element.elements() + minor fixes

Browse source
This commit is contained in:
Goffi 2015-05-27 19:12:38 +02:00
commit f51848a0ad
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tmp/wokkel/rsm.py
View file

@ -94,9 +94,7 @@ class RSMRequest():
@rtype: L{RSMRequest}
"""
try:
set_elt = domish.generateElementsQNamed(element.elements(),
name="set",
uri=NS_RSM).next()
set_elt = element.elements(NS_RSM, 'set').next()
except StopIteration:
raise RSMNotFoundError()
@ -194,9 +192,7 @@ class RSMResponse():
@rtype: L{RSMResponse}
"""
try:
set_elt = domish.generateElementsQNamed(element.elements(),
name="set",
uri=NS_RSM).next()
set_elt = element.elements(NS_RSM, 'set').next()
except StopIteration:
return RSMNotFoundError()
@ -331,9 +327,8 @@ class PubSubClient(pubsub.PubSubClient):
def cb(iq):
items = []
if iq.pubsub.items:
for element in iq.pubsub.items.elements():
if element.uri == pubsub.NS_PUBSUB and element.name == 'item':
items.append(element)
for element in iq.pubsub.items.elements(pubsub.NS_PUBSUB, 'item'):
items.append(element)
if request.rsm:
response = RSMResponse.parse(iq.pubsub)
@ -345,21 +340,20 @@ class PubSubClient(pubsub.PubSubClient):
d.addCallback(cb)
return d
def getRSMResponse(self, id):
"""
Post-retrieve the RSM response data after items retrieval is done.
def getRSMResponse(self, id_):
"""Post-retrieve the RSM response data after items retrieval is done.
@param id: extension data ID
@type id: C{unicode}
@param id_: extension data ID
@type id_: C{unicode}
@return: dict representation of the RSM response.
@rtype: C{dict} of C{unicode}
"""
# This method exists to not modify the return value of self.items.
if id not in self._rsm_responses:
if id_ not in self._rsm_responses:
return {}
result = self._rsm_responses[id].toDict()
del self._rsm_responses[id]
result = self._rsm_responses[id_].toDict()
del self._rsm_responses[id_]
return result