jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asyncio.async has been scheduled for removal for a long time now

Browse Source 
move to asyncio.ensure_future
This commit is contained in:
mathieui
2018-02-11 19:25:38 +01:00
parent e177726387
commit 979396bb1e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slixmpp/plugins/xep_0065/proxy.py
View File

@@ -215,7 +215,7 @@ class XEP_0065(BasePlugin):
self.xmpp.event('socks5_stream', conn)
self.xmpp.event('stream:%s:%s' % (sid, requester), conn)
asyncio.async(gather(proxy_futures, iq, streamhosts))
asyncio.ensure_future(gather(proxy_futures, iq, streamhosts))
def activate(self, proxy, sid, target, ifrom=None, timeout=None, callback=None):
"""Activate the socks5 session that has been negotiated."""

4
slixmpp/plugins/xep_0163.py
View File

@@ -62,7 +62,7 @@ class XEP_0163(BasePlugin):
for ns in namespace:
self.xmpp['xep_0030'].add_feature('%s+notify' % ns,
jid=jid)
asyncio.async(self.xmpp['xep_0115'].update_caps(jid))
asyncio.ensure_future(self.xmpp['xep_0115'].update_caps(jid))
def remove_interest(self, namespace, jid=None):
"""
@@ -81,7 +81,7 @@ class XEP_0163(BasePlugin):
for ns in namespace:
self.xmpp['xep_0030'].del_feature(jid=jid,
feature='%s+notify' % namespace)
asyncio.async(self.xmpp['xep_0115'].update_caps(jid))
asyncio.ensure_future(self.xmpp['xep_0115'].update_caps(jid))
def publish(self, stanza, node=None, id=None, options=None, ifrom=None,
timeout_callback=None, callback=None, timeout=None):

2
slixmpp/xmlstream/handler/coroutine_callback.py
View File

@@ -78,7 +78,7 @@ class CoroutineCallback(BaseHandler):
:meth:`prerun()`. Defaults to ``False``.
"""
if not self._instream or instream:
asyncio.async(self._pointer(payload))
asyncio.ensure_future(self._pointer(payload))
if self._once:
self._destroy = True
del self._pointer

8
slixmpp/xmlstream/xmlstream.py
View File

@@ -285,7 +285,7 @@ class XMLStream(asyncio.BaseProtocol):
self.disable_starttls = disable_starttls
self.event("connecting")
self._current_connection_attempt = asyncio.async(self._connect_routine())
self._current_connection_attempt = asyncio.ensure_future(self._connect_routine())
@asyncio.coroutine
def _connect_routine(self):
@@ -322,7 +322,7 @@ class XMLStream(asyncio.BaseProtocol):
log.debug('Connection failed: %s', e)
self.event("connection_failed", e)
self.connect_loop_wait = self.connect_loop_wait * 2 + 1
self._current_connection_attempt = asyncio.async(self._connect_routine())
self._current_connection_attempt = asyncio.ensure_future(self._connect_routine())
def process(self, *, forever=True, timeout=None):
"""Process all the available XMPP events (receiving or sending data on the
@@ -558,7 +558,7 @@ class XMLStream(asyncio.BaseProtocol):
pem_cert = ssl.DER_cert_to_PEM_cert(der_cert)
self.event('ssl_cert', pem_cert)
asyncio.async(ssl_coro())
asyncio.ensure_future(ssl_coro())
def _start_keepalive(self, event):
"""Begin sending whitespace periodically to keep the connection alive.
@@ -777,7 +777,7 @@ class XMLStream(asyncio.BaseProtocol):
old_exception(e)
else:
self.exception(e)
asyncio.async(handler_callback_routine(handler_callback))
asyncio.ensure_future(handler_callback_routine(handler_callback))
else:
try:
handler_callback(data)