# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1448452990 -3600
# Node ID fd143578fe893d62fdda2e5865bd0927b6003438
# Parent  518a42587600be980229eeb6b493c3e8b19f6bfd
plugin XEP-0065: fixed bad error handling

diff -r 518a42587600 -r fd143578fe89 src/memory/disco.py
--- a/src/memory/disco.py	Wed Nov 25 12:13:03 2015 +0100
+++ b/src/memory/disco.py	Wed Nov 25 13:03:10 2015 +0100
@@ -172,7 +172,7 @@
         @param jid_: the jid of the target server (None for profile's server)
         @param profile: %(doc_profile)s
         @return: a set of found entities
-        @raise CancelError: the request timed out
+        @raise defer.CancelledError: the request timed out
         """
         found_entities = set()
 
diff -r 518a42587600 -r fd143578fe89 src/plugins/plugin_xep_0065.py
--- a/src/plugins/plugin_xep_0065.py	Wed Nov 25 12:13:03 2015 +0100
+++ b/src/plugins/plugin_xep_0065.py	Wed Nov 25 13:03:10 2015 +0100
@@ -760,7 +760,7 @@
             pass
         try:
             proxy = (yield self.host.findServiceEntities('proxy', 'bytestreams', profile=profile)).pop()
-        except (exceptions.CancelError, StopIteration):
+        except (defer.CancelledError, StopIteration):
             notFound(server)
         iq_elt = client.IQ('get')
         iq_elt['to'] = proxy.full()