diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-07-30 17:26:39 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-07-30 17:35:21 +0200 |
| commit | 39c8319ec4c155e7323429ccbf56984d85a195a6 (patch) | |
| tree | e54573393afa37a2e3274f8a1a7211352dc70094 | |
| parent | ecf22cb4a4261b1fbbe893a0ec1bf185fcc02db8 (diff) | |
| download | poezio-39c8319ec4c155e7323429ccbf56984d85a195a6.tar.gz poezio-39c8319ec4c155e7323429ccbf56984d85a195a6.tar.bz2 poezio-39c8319ec4c155e7323429ccbf56984d85a195a6.tar.xz poezio-39c8319ec4c155e7323429ccbf56984d85a195a6.zip | |
Fix a bunch of iq.send() by removing the `block` argument
| -rw-r--r-- | src/core/commands.py | 6 | ||||
| -rw-r--r-- | src/core/core.py | 6 | ||||
| -rw-r--r-- | src/multiuserchat.py | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/commands.py b/src/core/commands.py index c7d900c3..5254464a 100644 --- a/src/core/commands.py +++ b/src/core/commands.py @@ -815,11 +815,11 @@ def command_quit(self, arg=''): else: msg = None if config.get('enable_user_mood', True): - self.xmpp.plugin['xep_0107'].stop(block=False) + self.xmpp.plugin['xep_0107'].stop() if config.get('enable_user_activity', True): - self.xmpp.plugin['xep_0108'].stop(block=False) + self.xmpp.plugin['xep_0108'].stop() if config.get('enable_user_gaming', True): - self.xmpp.plugin['xep_0196'].stop(block=False) + self.xmpp.plugin['xep_0196'].stop() self.save_config() self.plugin_manager.disable_plugins() self.disconnect(msg) diff --git a/src/core/core.py b/src/core/core.py index feccd01c..c2996b5d 100644 --- a/src/core/core.py +++ b/src/core/core.py @@ -423,11 +423,11 @@ class Core(object): log.error("%s received. Exiting…", signals[sig]) if config.get('enable_user_mood', True): - self.xmpp.plugin['xep_0107'].stop(block=False) + self.xmpp.plugin['xep_0107'].stop() if config.get('enable_user_activity', True): - self.xmpp.plugin['xep_0108'].stop(block=False) + self.xmpp.plugin['xep_0108'].stop() if config.get('enable_user_gaming', True): - self.xmpp.plugin['xep_0196'].stop(block=False) + self.xmpp.plugin['xep_0196'].stop() self.plugin_manager.disable_plugins() self.disconnect('%s received' % signals.get(sig)) self.xmpp.add_event_handler("disconnected", self.exit, disposable=True) diff --git a/src/multiuserchat.py b/src/multiuserchat.py index dcbafdb2..c0bc21b5 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -47,7 +47,7 @@ def destroy_room(xmpp, room, reason='', altroom=''): _('Info')) else: xmpp.core.information(_('Room %s destroyed') % room, _('Info')) - iq.send(block=False, callback=callback) + iq.send(callback=callback) return True def send_private_message(xmpp, jid, line): @@ -142,7 +142,7 @@ def set_user_role(xmpp, jid, nick, reason, role, callback=None): iq.append(query) iq['to'] = jid if callback: - return iq.send(block=False, callback=callback) + return iq.send(callback=callback) try: return iq.send() except Exception as e: @@ -168,7 +168,7 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason iq = xmpp.makeIqSet(query) iq['to'] = muc_jid if callback: - return iq.send(block=False, callback=callback) + return iq.send(callback=callback) try: return xmpp.plugin['xep_0045'].setAffiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation) except: @@ -182,7 +182,7 @@ def cancel_config(xmpp, room): query.append(x) iq = xmpp.makeIqSet(query) iq['to'] = room - iq.send(block=False) + iq.send() def configure_room(xmpp, room, form): if form is None: @@ -193,5 +193,5 @@ def configure_room(xmpp, room, form): form = form.getXML('submit') query.append(form) iq.append(query) - iq.send(block=False) + iq.send() |