diff options
Diffstat (limited to 'slixmpp')
| -rw-r--r-- | slixmpp/plugins/xep_0279/ipcheck.py | 4 | ||||
| -rw-r--r-- | slixmpp/plugins/xep_0332/http.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/slixmpp/plugins/xep_0279/ipcheck.py b/slixmpp/plugins/xep_0279/ipcheck.py index 56d9afd4..8954c3d9 100644 --- a/slixmpp/plugins/xep_0279/ipcheck.py +++ b/slixmpp/plugins/xep_0279/ipcheck.py @@ -31,11 +31,11 @@ class XEP_0279(BasePlugin): def plugin_end(self): self.xmpp['xep_0030'].del_feature(feature='urn:xmpp:sic:0') - def check_ip(self, ifrom=None, block=True, timeout=None, callback=None, + def check_ip(self, ifrom=None, timeout=None, callback=None, timeout_callback=None): iq = self.xmpp.Iq() iq['type'] = 'get' iq['from'] = ifrom iq.enable('ip_check') - return iq.send(block=block, timeout=timeout, callback=callback, + return iq.send(timeout=timeout, callback=callback, timeout_callback=timeout_callback) diff --git a/slixmpp/plugins/xep_0332/http.py b/slixmpp/plugins/xep_0332/http.py index bebb0e69..50f14322 100644 --- a/slixmpp/plugins/xep_0332/http.py +++ b/slixmpp/plugins/xep_0332/http.py @@ -114,7 +114,6 @@ class XEP_0332(BasePlugin): iq['http-req']['data'] = data return iq.send( timeout=kwargs.get('timeout', None), - block=kwargs.get('block', True), callback=kwargs.get('callback', None), timeout_callback=kwargs.get('timeout_callback', None) ) @@ -135,7 +134,6 @@ class XEP_0332(BasePlugin): iq['http-resp']['data'] = data return iq.send( timeout=kwargs.get('timeout', None), - block=kwargs.get('block', True), callback=kwargs.get('callback', None), timeout_callback=kwargs.get('timeout_callback', None) ) @@ -153,7 +151,6 @@ class XEP_0332(BasePlugin): iq['id'] = kwargs["id"] return iq.send( timeout=kwargs.get('timeout', None), - block=kwargs.get('block', True), callback=kwargs.get('callback', None), timeout_callback=kwargs.get('timeout_callback', None) ) |