summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0191/blocking.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-02-12 12:21:20 +0100
committermathieui <mathieui@mathieui.net>2015-02-12 12:21:20 +0100
commit4d063e287e1bb2010d115325a3c8c6ca7c542bfc (patch)
treea8893d89d44d92e25a078a1d481152cf319b3b14 /slixmpp/plugins/xep_0191/blocking.py
parent44f02fb3ab286e80d7f82031f751b3650cb94f8b (diff)
downloadslixmpp-4d063e287e1bb2010d115325a3c8c6ca7c542bfc.tar.gz
slixmpp-4d063e287e1bb2010d115325a3c8c6ca7c542bfc.tar.bz2
slixmpp-4d063e287e1bb2010d115325a3c8c6ca7c542bfc.tar.xz
slixmpp-4d063e287e1bb2010d115325a3c8c6ca7c542bfc.zip
Remove more threaded= and block= options from the plugins
(also, correct a typo)
Diffstat (limited to 'slixmpp/plugins/xep_0191/blocking.py')
-rw-r--r--slixmpp/plugins/xep_0191/blocking.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/slixmpp/plugins/xep_0191/blocking.py b/slixmpp/plugins/xep_0191/blocking.py
index 92a5781b..22610d78 100644
--- a/slixmpp/plugins/xep_0191/blocking.py
+++ b/slixmpp/plugins/xep_0191/blocking.py
@@ -45,14 +45,14 @@ class XEP_0191(BasePlugin):
self.xmpp.remove_handler('Blocked Contact')
self.xmpp.remove_handler('Unblocked Contact')
- def get_blocked(self, ifrom=None, block=True, timeout=None, callback=None):
+ def get_blocked(self, ifrom=None, timeout=None, callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'get'
iq['from'] = ifrom
iq.enable('blocklist')
- return iq.send(block=block, timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback)
- def block(self, jids, ifrom=None, block=True, timeout=None, callback=None):
+ def block(self, jids, ifrom=None, timeout=None, callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['from'] = ifrom
@@ -61,9 +61,9 @@ class XEP_0191(BasePlugin):
jids = [jids]
iq['block']['items'] = jids
- return iq.send(block=block, timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback)
- def unblock(self, jids=None, ifrom=None, block=True, timeout=None, callback=None):
+ def unblock(self, jids=None, ifrom=None, timeout=None, callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['from'] = ifrom
@@ -74,7 +74,7 @@ class XEP_0191(BasePlugin):
jids = [jids]
iq['unblock']['items'] = jids
- return iq.send(block=block, timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback)
def _handle_blocked(self, iq):
self.xmpp.event('blocked', iq)