summaryrefslogtreecommitdiff
path: root/examples/custom_stanzas
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-08-16 22:37:29 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-09-01 02:42:45 +0200
commit476d76a53301f9da2ac7efa094e209b0607adfdc (patch)
tree0307c1205944027fe79eab66d2b7ec293ed31238 /examples/custom_stanzas
parentdf68bb48961574436c1ffc2463a31cd7d8227606 (diff)
downloadslixmpp-476d76a53301f9da2ac7efa094e209b0607adfdc.tar.gz
slixmpp-476d76a53301f9da2ac7efa094e209b0607adfdc.tar.bz2
slixmpp-476d76a53301f9da2ac7efa094e209b0607adfdc.tar.xz
slixmpp-476d76a53301f9da2ac7efa094e209b0607adfdc.zip
Remove threaded from examples’ add_event_handler.
Diffstat (limited to 'examples/custom_stanzas')
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_provider.py7
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_user.py2
2 files changed, 2 insertions, 7 deletions
diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py
index 5782b671..b1b6e0a9 100755
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/examples/custom_stanzas/custom_stanza_provider.py
@@ -46,8 +46,7 @@ class ActionBot(slixmpp.ClientXMPP):
self._handle_action))
self.add_event_handler('custom_action',
- self._handle_action_event,
- threaded=True)
+ self._handle_action_event)
register_stanza_plugin(Iq, Action)
@@ -77,10 +76,6 @@ class ActionBot(slixmpp.ClientXMPP):
def _handle_action_event(self, iq):
"""
Respond to the custom action event.
-
- Since one of the actions is to disconnect, this
- event handler needs to be run in threaded mode, by
- using `threaded=True` in the `add_event_handler` call.
"""
method = iq['action']['method']
param = iq['action']['param']
diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py
index 21722196..af6bf9b3 100755
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/examples/custom_stanzas/custom_stanza_user.py
@@ -38,7 +38,7 @@ class ActionUserBot(slixmpp.ClientXMPP):
# and the XML streams are ready for use. We want to
# listen for this event so that we we can initialize
# our roster.
- self.add_event_handler("session_start", self.start, threaded=True)
+ self.add_event_handler("session_start", self.start)
self.add_event_handler("message", self.message)
register_stanza_plugin(Iq, Action)