plugin XEP-0065: fixed bad error handling
This commit is contained in:
parent
78a86f7440
commit
5afdf1c1ca
2 changed files with 2 additions and 2 deletions
|
|
@ -172,7 +172,7 @@ class Discovery(object):
|
||||||
@param jid_: the jid of the target server (None for profile's server)
|
@param jid_: the jid of the target server (None for profile's server)
|
||||||
@param profile: %(doc_profile)s
|
@param profile: %(doc_profile)s
|
||||||
@return: a set of found entities
|
@return: a set of found entities
|
||||||
@raise CancelError: the request timed out
|
@raise defer.CancelledError: the request timed out
|
||||||
"""
|
"""
|
||||||
found_entities = set()
|
found_entities = set()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -760,7 +760,7 @@ class XEP_0065(object):
|
||||||
pass
|
pass
|
||||||
try:
|
try:
|
||||||
proxy = (yield self.host.findServiceEntities('proxy', 'bytestreams', profile=profile)).pop()
|
proxy = (yield self.host.findServiceEntities('proxy', 'bytestreams', profile=profile)).pop()
|
||||||
except (exceptions.CancelError, StopIteration):
|
except (defer.CancelledError, StopIteration):
|
||||||
notFound(server)
|
notFound(server)
|
||||||
iq_elt = client.IQ('get')
|
iq_elt = client.IQ('get')
|
||||||
iq_elt['to'] = proxy.full()
|
iq_elt['to'] = proxy.full()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue