From cc4522d9cd256489459c2611e867dece52449363 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 14 Feb 2017 01:00:41 +0100 Subject: Fix custom stanza examples --- examples/custom_stanzas/custom_stanza_provider.py | 19 +++++++++++-------- examples/custom_stanzas/custom_stanza_user.py | 12 ++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py index 9927c449..bca4a904 100755 --- a/examples/custom_stanzas/custom_stanza_provider.py +++ b/examples/custom_stanzas/custom_stanza_provider.py @@ -50,7 +50,7 @@ class ActionBot(slixmpp.ClientXMPP): register_stanza_plugin(Iq, Action) - def start(self, event): + async def start(self, event): """ Process the session_start event. @@ -73,7 +73,7 @@ class ActionBot(slixmpp.ClientXMPP): """ self.event('custom_action', iq) - def _handle_action_event(self, iq): + async def _handle_action_event(self, iq): """ Respond to the custom action event. """ @@ -82,17 +82,20 @@ class ActionBot(slixmpp.ClientXMPP): if method == 'is_prime' and param == '2': print("got message: %s" % iq) - iq.reply() - iq['action']['status'] = 'done' - iq.send() + rep = iq.reply() + rep['action']['status'] = 'done' + await rep.send() elif method == 'bye': print("got message: %s" % iq) + rep = iq.reply() + rep['action']['status'] = 'done' + await rep.send() self.disconnect() else: print("got message: %s" % iq) - iq.reply() - iq['action']['status'] = 'error' - iq.send() + rep = iq.reply() + rep['action']['status'] = 'error' + await rep.send() if __name__ == '__main__': # Setup the command line arguments. diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py index c5630584..4119aa97 100755 --- a/examples/custom_stanzas/custom_stanza_user.py +++ b/examples/custom_stanzas/custom_stanza_user.py @@ -43,7 +43,7 @@ class ActionUserBot(slixmpp.ClientXMPP): register_stanza_plugin(Iq, Action) - def start(self, event): + async def start(self, event): """ Process the session_start event. @@ -57,11 +57,11 @@ class ActionUserBot(slixmpp.ClientXMPP): data. """ self.send_presence() - self.get_roster() + await self.get_roster() - self.send_custom_iq() + await self.send_custom_iq() - def send_custom_iq(self): + async def send_custom_iq(self): """Create and send two custom actions. If the first action was successful, then send @@ -74,14 +74,14 @@ class ActionUserBot(slixmpp.ClientXMPP): iq['action']['param'] = '2' try: - resp = iq.send() + resp = await iq.send() if resp['action']['status'] == 'done': #sending bye iq2 = self.Iq() iq2['to'] = self.action_provider iq2['type'] = 'set' iq2['action']['method'] = 'bye' - iq2.send(block=False) + await iq2.send() self.disconnect() except XMPPError: -- cgit v1.2.3