summaryrefslogtreecommitdiff
path: root/src/core/completions.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-08-01 15:01:25 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-08-01 15:01:25 +0200
commit992fe72554de694750519f3f12886023314a8278 (patch)
tree5ac5f4774cbc81c8505ac8d2f2295cf968ce23d2 /src/core/completions.py
parent3ec9e80de48225c7f27c19cdc0546762c042d0d1 (diff)
downloadpoezio-992fe72554de694750519f3f12886023314a8278.tar.gz
poezio-992fe72554de694750519f3f12886023314a8278.tar.bz2
poezio-992fe72554de694750519f3f12886023314a8278.tar.xz
poezio-992fe72554de694750519f3f12886023314a8278.zip
Fix a few blocking iq, and remove all block=False function arguments
Diffstat (limited to 'src/core/completions.py')
-rw-r--r--src/core/completions.py17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/core/completions.py b/src/core/completions.py
index f8fb7fc8..7acddef9 100644
--- a/src/core/completions.py
+++ b/src/core/completions.py
@@ -106,22 +106,7 @@ def completion_join(self, the_input):
if the_input.last_completion:
return the_input.new_completion([], 1, quotify=True)
- if jid.server and not jid.user:
- # no room was given: complete the node
- try:
- response = self.xmpp.plugin['xep_0030'].get_items(jid=jid.server, block=True, timeout=1)
- except:
- log.error('/join completion: Unable to get the list of rooms for %s',
- jid.server,
- exc_info=True)
- response = None
- if response:
- items = response['disco_items'].get_items()
- else:
- return True
- items = sorted('%s/%s' % (tup[0], jid.resource) for tup in items)
- return the_input.new_completion(items, 1, quotify=True, override=True)
- elif jid.user:
+ if jid.user:
# we are writing the server: complete the server
serv_list = []
for tab in self.get_tabs(tabs.MucTab):