From 3502480384bd7d9f4e4eb1a3b92e8df08f4e487c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 1 Jul 2018 18:46:33 +0200 Subject: Switch from @asyncio.coroutine to async def everywhere. --- slixmpp/features/feature_bind/bind.py | 5 ++--- slixmpp/features/feature_session/session.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'slixmpp/features') diff --git a/slixmpp/features/feature_bind/bind.py b/slixmpp/features/feature_bind/bind.py index e837ee0a..bd2a3b99 100644 --- a/slixmpp/features/feature_bind/bind.py +++ b/slixmpp/features/feature_bind/bind.py @@ -35,8 +35,7 @@ class FeatureBind(BasePlugin): register_stanza_plugin(Iq, stanza.Bind) register_stanza_plugin(StreamFeatures, stanza.Bind) - @asyncio.coroutine - def _handle_bind_resource(self, features): + async def _handle_bind_resource(self, features): """ Handle requesting a specific resource. @@ -51,7 +50,7 @@ class FeatureBind(BasePlugin): if self.xmpp.requested_jid.resource: iq['bind']['resource'] = self.xmpp.requested_jid.resource - yield from iq.send(callback=self._on_bind_response) + await iq.send(callback=self._on_bind_response) def _on_bind_response(self, response): self.xmpp.boundjid = JID(response['bind']['jid']) diff --git a/slixmpp/features/feature_session/session.py b/slixmpp/features/feature_session/session.py index e0e69e87..643c34ef 100644 --- a/slixmpp/features/feature_session/session.py +++ b/slixmpp/features/feature_session/session.py @@ -35,8 +35,7 @@ class FeatureSession(BasePlugin): register_stanza_plugin(Iq, stanza.Session) register_stanza_plugin(StreamFeatures, stanza.Session) - @asyncio.coroutine - def _handle_start_session(self, features): + async def _handle_start_session(self, features): """ Handle the start of the session. @@ -51,7 +50,7 @@ class FeatureSession(BasePlugin): iq = self.xmpp.Iq() iq['type'] = 'set' iq.enable('session') - yield from iq.send(callback=self._on_start_session_response) + await iq.send(callback=self._on_start_session_response) def _on_start_session_response(self, response): self.xmpp.features.add('session') -- cgit v1.2.3