From 9390794401f438e93ac39805b77bcca05d5a3e47 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 27 Jan 2021 00:09:26 +0100 Subject: examples: updates to reflect asyncio --- examples/IoT_TestDevice.py | 4 ++-- examples/migrate_roster.py | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/IoT_TestDevice.py b/examples/IoT_TestDevice.py index b9546017..d8e8fd06 100755 --- a/examples/IoT_TestDevice.py +++ b/examples/IoT_TestDevice.py @@ -168,13 +168,13 @@ if __name__ == '__main__': xmpp.beClientOrServer(server=True) while not(xmpp.testForRelease()): xmpp.connect() - xmpp.process(block=True) + xmpp.process(forever=False) logging.debug("lost connection") if args.sensorjid: logging.debug("will try to call another device for data") xmpp.beClientOrServer(server=False,clientJID=args.sensorjid) xmpp.connect() - xmpp.process(block=True) + xmpp.process(forever=False) logging.debug("ready ending") else: diff --git a/examples/migrate_roster.py b/examples/migrate_roster.py index be457fb3..1fe5895a 100755 --- a/examples/migrate_roster.py +++ b/examples/migrate_roster.py @@ -73,21 +73,21 @@ old_xmpp = slixmpp.ClientXMPP(args.old_jid, args.old_password) roster = [] -def on_session(event): - roster.append(old_xmpp.get_roster()) +async def on_session(event): + roster.append(await old_xmpp.get_roster()) old_xmpp.disconnect() old_xmpp.add_event_handler('session_start', on_session) if old_xmpp.connect(): - old_xmpp.process(block=True) + old_xmpp.process(forever=False) if not roster: print('No roster to migrate') sys.exit() new_xmpp = slixmpp.ClientXMPP(args.new_jid, args.new_password) -def on_session2(event): - new_xmpp.get_roster() +async def on_session2(event): + await new_xmpp.get_roster() new_xmpp.send_presence() logging.info(roster[0]) @@ -97,9 +97,11 @@ def on_session2(event): for jid, item in data.items(): if item['subscription'] != 'none': new_xmpp.send_presence(ptype='subscribe', pto=jid) - new_xmpp.update_roster(jid, - name = item['name'], - groups = item['groups']) + await new_xmpp.update_roster( + jid, + name=item['name'], + groups=item['groups'] + ) new_xmpp.disconnect() new_xmpp.add_event_handler('session_start', on_session2) -- cgit v1.2.3