diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-27 23:21:27 +0200 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-27 23:21:27 +0200 |
commit | e241d4e3c74a7414a01c0a4f8bfd2f80a3853545 (patch) | |
tree | f484ab4126de2b8abae33e104ba694d096893e69 /slixmpp/plugins/xep_0030/disco.py | |
parent | bd22a41a783615f415f9f5f6f530b8b2ba226952 (diff) | |
download | slixmpp-e241d4e3c74a7414a01c0a4f8bfd2f80a3853545.tar.gz slixmpp-e241d4e3c74a7414a01c0a4f8bfd2f80a3853545.tar.bz2 slixmpp-e241d4e3c74a7414a01c0a4f8bfd2f80a3853545.tar.xz slixmpp-e241d4e3c74a7414a01c0a4f8bfd2f80a3853545.zip |
XEP-0030: Don’t call the timeout_callback on each domain which doesn’t reply to disco#info.
Diffstat (limited to 'slixmpp/plugins/xep_0030/disco.py')
-rw-r--r-- | slixmpp/plugins/xep_0030/disco.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py index 460a9134..59b1e0cc 100644 --- a/slixmpp/plugins/xep_0030/disco.py +++ b/slixmpp/plugins/xep_0030/disco.py @@ -299,18 +299,18 @@ class XEP_0030(BasePlugin): return self.api['has_identity'](jid, node, ifrom, data) async def get_info_from_domain(self, domain=None, timeout=None, - cached=True, callback=None, **kwargs): + cached=True, callback=None): if domain is None: domain = self.xmpp.boundjid.domain if not cached or domain not in self.domain_infos: infos = [self.get_info( - domain, timeout=timeout, **kwargs)] + domain, timeout=timeout)] iq_items = await self.get_items( - domain, timeout=timeout, **kwargs) + domain, timeout=timeout) items = iq_items['disco_items']['items'] infos += [ - self.get_info(item[0], timeout=timeout, **kwargs) + self.get_info(item[0], timeout=timeout) for item in items] info_futures, _ = await asyncio.wait( infos, @@ -319,7 +319,7 @@ class XEP_0030(BasePlugin): ) self.domain_infos[domain] = [ - future.result() for future in info_futures] + future.result() for future in info_futures if not future.exception()] results = self.domain_infos[domain] |