diff options
author | mathieui <mathieui@mathieui.net> | 2015-02-12 12:21:20 +0100 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2015-02-12 12:21:20 +0100 |
commit | 4d063e287e1bb2010d115325a3c8c6ca7c542bfc (patch) | |
tree | a8893d89d44d92e25a078a1d481152cf319b3b14 /slixmpp/plugins/xep_0080 | |
parent | 44f02fb3ab286e80d7f82031f751b3650cb94f8b (diff) | |
download | slixmpp-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_0080')
-rw-r--r-- | slixmpp/plugins/xep_0080/geoloc.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/slixmpp/plugins/xep_0080/geoloc.py b/slixmpp/plugins/xep_0080/geoloc.py index 320bb958..3f0285bd 100644 --- a/slixmpp/plugins/xep_0080/geoloc.py +++ b/slixmpp/plugins/xep_0080/geoloc.py @@ -76,8 +76,6 @@ class XEP_0080(BasePlugin): options -- Optional form of publish options. ifrom -- Specify the sender's JID. - block -- Specify if the send call will block until a response - is received, or a timeout occurs. Defaults to True. timeout -- The length of time (in seconds) to wait for a response before exiting the send call if blocking is used. Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT @@ -86,7 +84,6 @@ class XEP_0080(BasePlugin): """ options = kwargs.get('options', None) ifrom = kwargs.get('ifrom', None) - block = kwargs.get('block', None) callback = kwargs.get('callback', None) timeout = kwargs.get('timeout', None) for param in ('ifrom', 'block', 'callback', 'timeout', 'options'): @@ -99,18 +96,15 @@ class XEP_0080(BasePlugin): return self.xmpp['xep_0163'].publish(geoloc, options=options, ifrom=ifrom, - block=block, callback=callback, timeout=timeout) - def stop(self, ifrom=None, block=True, callback=None, timeout=None): + def stop(self, ifrom=None, callback=None, timeout=None): """ Clear existing user location information to stop notifications. Arguments: ifrom -- Specify the sender's JID. - block -- Specify if the send call will block until a response - is received, or a timeout occurs. Defaults to True. timeout -- The length of time (in seconds) to wait for a response before exiting the send call if blocking is used. Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT @@ -120,6 +114,5 @@ class XEP_0080(BasePlugin): geoloc = Geoloc() return self.xmpp['xep_0163'].publish(geoloc, ifrom=ifrom, - block=block, callback=callback, timeout=timeout) |