[Python-checkins] bpo-38107: Replace direct future and task contructor calls with factories in asyncio tests (GH-15928)

Miss Islington (bot) webhook-mailer at python.org
Wed Sep 11 10:21:57 EDT 2019

• Previous message (by thread): [Python-checkins] bpo-38107: Replace direct future and task contructor calls with factories in asyncio tests (GH-15928)
• Next message (by thread): [Python-checkins] bpo-34519: Add additional aliases for HP Roman 8 (GH-8956)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

https://github.com/python/cpython/commit/b18b19809d24182e9837b27b1c0af65458dff3ba
commit: b18b19809d24182e9837b27b1c0af65458dff3ba
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019年09月11日T07:21:53-07:00
summary:
bpo-38107: Replace direct future and task contructor calls with factories in asyncio tests (GH-15928)
(cherry picked from commit 9aee90018a5213e3529768e0b873955d23f5e50b)
Co-authored-by: Andrew Svetlov <andrew.svetlov at gmail.com>
files:
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_events.py
M Lib/test/test_asyncio/test_locks.py
M Lib/test/test_asyncio/test_pep492.py
M Lib/test/test_asyncio/test_proactor_events.py
M Lib/test/test_asyncio/test_queues.py
M Lib/test/test_asyncio/test_selector_events.py
M Lib/test/test_asyncio/test_sock_lowlevel.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_streams.py
M Lib/test/test_asyncio/test_subprocess.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_asyncio/test_unix_events.py
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 08d4792fa726..370e6a6dfa79 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -193,7 +193,7 @@ def test_close(self):
 self.loop.close()
 
 # operation blocked when the loop is closed
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 self.assertRaises(RuntimeError, self.loop.run_forever)
 self.assertRaises(RuntimeError, self.loop.run_until_complete, f)
 
@@ -324,7 +324,7 @@ def check_in_thread(loop, event, debug, create_loop, fut):
 
 def test_thread(loop, debug, create_loop=False):
 event = threading.Event()
- fut = asyncio.Future(loop=loop)
+ fut = loop.create_future()
 loop.call_soon(event.set)
 args = (loop, event, debug, create_loop, fut)
 thread = threading.Thread(target=check_in_thread, args=args)
@@ -472,7 +472,7 @@ def test_run_until_complete_type_error(self):
 self.loop.run_until_complete, 'blah')
 
 def test_run_until_complete_loop(self):
- task = asyncio.Future(loop=self.loop)
+ task = self.loop.create_future()
 other_loop = self.new_test_loop()
 self.addCleanup(other_loop.close)
 self.assertRaises(ValueError,
@@ -555,7 +555,7 @@ def zero_error(fut):
 
 # Test call_soon (events.Handle)
 with mock.patch('asyncio.base_events.logger') as log:
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 self.loop.call_soon(zero_error, fut)
 fut.add_done_callback(lambda fut: self.loop.stop())
 self.loop.run_forever()
@@ -565,7 +565,7 @@ def zero_error(fut):
 
 # Test call_later (events.TimerHandle)
 with mock.patch('asyncio.base_events.logger') as log:
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 self.loop.call_later(0.01, zero_error, fut)
 fut.add_done_callback(lambda fut: self.loop.stop())
 self.loop.run_forever()
@@ -996,7 +996,7 @@ def __init__(self, create_future=False):
 self.state = 'INITIAL'
 self.nbytes = 0
 if create_future:
- self.done = asyncio.Future()
+ self.done = asyncio.get_running_loop().create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -1026,7 +1026,7 @@ def __init__(self, create_future=False, loop=None):
 self.state = 'INITIAL'
 self.nbytes = 0
 if create_future:
- self.done = asyncio.Future(loop=loop)
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -1071,7 +1071,7 @@ class MyProto(asyncio.Protocol):
 (2, 1, 6, '', ('107.6.106.82', 80))]
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 idx = -1
 errors = ['err1', 'err2']
@@ -1098,7 +1098,7 @@ def test_create_connection_timeout(self, m_socket):
 m_socket.socket.return_value = sock
 
 def getaddrinfo(*args, **kw):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 addr = (socket.AF_INET, socket.SOCK_STREAM, 0, '',
 ('127.0.0.1', 80))
 fut.set_result([addr])
@@ -1190,7 +1190,7 @@ def test_create_connection_no_getaddrinfo(self):
 return []
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 self.loop.getaddrinfo = getaddrinfo_task
 coro = self.loop.create_connection(MyProto, 'example.com', 80)
@@ -1202,7 +1202,7 @@ def test_create_connection_connect_err(self):
 return [(2, 1, 6, '', ('107.6.106.82', 80))]
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 self.loop.getaddrinfo = getaddrinfo_task
 self.loop.sock_connect = mock.Mock()
@@ -1218,7 +1218,7 @@ def test_create_connection_multiple(self):
 (2, 1, 6, '', ('0.0.0.2', 80))]
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 self.loop.getaddrinfo = getaddrinfo_task
 self.loop.sock_connect = mock.Mock()
@@ -1245,7 +1245,7 @@ def bind(addr):
 (2, 1, 6, '', ('0.0.0.2', 80))]
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 self.loop.getaddrinfo = getaddrinfo_task
 self.loop.sock_connect = mock.Mock()
@@ -1377,7 +1377,7 @@ def test_create_connection_no_local_addr(self):
 return []
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 self.loop.getaddrinfo = getaddrinfo_task
 
 coro = self.loop.create_connection(
@@ -1405,7 +1405,7 @@ def test_create_connection_ssl_server_hostname_default(self):
 self.loop.getaddrinfo = mock.Mock()
 
 def mock_getaddrinfo(*args, **kwds):
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 f.set_result([(socket.AF_INET, socket.SOCK_STREAM,
 socket.SOL_TCP, '', ('1.2.3.4', 80))])
 return f
@@ -1513,7 +1513,7 @@ def test_create_server_empty_host(self):
 return []
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 self.loop.getaddrinfo = getaddrinfo_task
 fut = self.loop.create_server(MyProto, '', 0)
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 95dac72b6d7e..b0ade1ed3ba1 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -81,8 +81,8 @@ def __init__(self, loop=None):
 self.state = 'INITIAL'
 self.nbytes = 0
 if loop is not None:
- self.connected = asyncio.Future(loop=loop)
- self.done = asyncio.Future(loop=loop)
+ self.connected = loop.create_future()
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -119,7 +119,7 @@ def __init__(self, loop=None):
 self.state = 'INITIAL'
 self.nbytes = 0
 if loop is not None:
- self.done = asyncio.Future(loop=loop)
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -148,7 +148,7 @@ def __init__(self, loop=None):
 self.nbytes = 0
 self.transport = None
 if loop is not None:
- self.done = asyncio.Future(loop=loop)
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -179,7 +179,7 @@ def __init__(self, loop=None):
 self.state = 'INITIAL'
 self.transport = None
 if loop is not None:
- self.done = asyncio.Future(loop=loop)
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
@@ -198,9 +198,9 @@ class MySubprocessProtocol(asyncio.SubprocessProtocol):
 def __init__(self, loop):
 self.state = 'INITIAL'
 self.transport = None
- self.connected = asyncio.Future(loop=loop)
- self.completed = asyncio.Future(loop=loop)
- self.disconnects = {fd: asyncio.Future(loop=loop) for fd in range(3)}
+ self.connected = loop.create_future()
+ self.completed = loop.create_future()
+ self.disconnects = {fd: loop.create_future() for fd in range(3)}
 self.data = {1: b'', 2: b''}
 self.returncode = None
 self.got_data = {1: asyncio.Event(loop=loop),
@@ -738,7 +738,7 @@ def create_server_multiple_hosts(self, family, hosts, mock_sock):
 return [(family, socket.SOCK_STREAM, 6, '', (host, port, 0, 0))]
 
 def getaddrinfo_task(*args, **kwds):
- return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
+ return self.loop.create_task(getaddrinfo(*args, **kwds))
 
 unique_hosts = set(hosts)
 
@@ -1094,7 +1094,7 @@ def test_create_server_ssl_verified(self):
 client, pr = self.loop.run_until_complete(f_c)
 
 # extra info is available
- self.check_ssl_extra_info(client,peername=(host, port),
+ self.check_ssl_extra_info(client, peername=(host, port),
 peercert=test_utils.PEERCERT)
 
 # close connection
@@ -1104,7 +1104,7 @@ def test_create_server_ssl_verified(self):
 self.loop.run_until_complete(proto.done)
 
 def test_create_server_sock(self):
- proto = asyncio.Future(loop=self.loop)
+ proto = self.loop.create_future()
 
 class TestMyProto(MyProto):
 def connection_made(self, transport):
@@ -1143,7 +1143,7 @@ def test_create_server_addr_in_use(self):
 
 @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 not supported or enabled')
 def test_create_server_dual_stack(self):
- f_proto = asyncio.Future(loop=self.loop)
+ f_proto = self.loop.create_future()
 
 class TestMyProto(MyProto):
 def connection_made(self, transport):
@@ -1172,7 +1172,7 @@ def connection_made(self, transport):
 proto.transport.close()
 client.close()
 
- f_proto = asyncio.Future(loop=self.loop)
+ f_proto = self.loop.create_future()
 client = socket.socket(socket.AF_INET6)
 client.connect(('::1', port))
 client.send(b'xxx')
@@ -1587,7 +1587,7 @@ def test_prompt_cancellation(self):
 return res
 
 start = time.monotonic()
- t = asyncio.Task(main(), loop=self.loop)
+ t = self.loop.create_task(main())
 self.loop.run_forever()
 elapsed = time.monotonic() - start
 
@@ -1673,7 +1673,7 @@ def test_close(self):
 with self.assertRaises(RuntimeError):
 self.loop.run_forever()
 with self.assertRaises(RuntimeError):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 self.loop.run_until_complete(fut)
 with self.assertRaises(RuntimeError):
 self.loop.call_soon(func)
diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index a9953b4b2a2d..9468e740b3c1 100644
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -124,8 +124,8 @@ def test_acquire(self):
 result.append(3)
 return True
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
@@ -137,7 +137,7 @@ def test_acquire(self):
 test_utils.run_briefly(self.loop)
 self.assertEqual([1], result)
 
- t3 = asyncio.Task(c3(result), loop=self.loop)
+ t3 = self.loop.create_task(c3(result))
 
 lock.release()
 test_utils.run_briefly(self.loop)
@@ -159,7 +159,7 @@ def test_acquire_cancel(self):
 lock = asyncio.Lock(loop=self.loop)
 self.assertTrue(self.loop.run_until_complete(lock.acquire()))
 
- task = asyncio.Task(lock.acquire(), loop=self.loop)
+ task = self.loop.create_task(lock.acquire())
 self.loop.call_soon(task.cancel)
 self.assertRaises(
 asyncio.CancelledError,
@@ -192,14 +192,14 @@ def test_cancel_race(self):
 finally:
 lock.release()
 
- fa = asyncio.Future(loop=self.loop)
- ta = asyncio.Task(lockit('A', fa), loop=self.loop)
+ fa = self.loop.create_future()
+ ta = self.loop.create_task(lockit('A', fa))
 test_utils.run_briefly(self.loop)
 self.assertTrue(lock.locked())
- tb = asyncio.Task(lockit('B', None), loop=self.loop)
+ tb = self.loop.create_task(lockit('B', None))
 test_utils.run_briefly(self.loop)
 self.assertEqual(len(lock._waiters), 1)
- tc = asyncio.Task(lockit('C', None), loop=self.loop)
+ tc = self.loop.create_task(lockit('C', None))
 test_utils.run_briefly(self.loop)
 self.assertEqual(len(lock._waiters), 2)
 
@@ -267,17 +267,17 @@ def test_finished_waiter_cancelled(self):
 with self.assertWarns(DeprecationWarning):
 lock = asyncio.Lock(loop=self.loop)
 
- ta = asyncio.Task(lock.acquire(), loop=self.loop)
+ ta = self.loop.create_task(lock.acquire())
 test_utils.run_briefly(self.loop)
 self.assertTrue(lock.locked())
 
- tb = asyncio.Task(lock.acquire(), loop=self.loop)
+ tb = self.loop.create_task(lock.acquire())
 test_utils.run_briefly(self.loop)
 self.assertEqual(len(lock._waiters), 1)
 
 # Create a second waiter, wake up the first, and cancel it.
 # Without the fix, the second was not woken up.
- tc = asyncio.Task(lock.acquire(), loop=self.loop)
+ tc = self.loop.create_task(lock.acquire())
 lock.release()
 tb.cancel()
 test_utils.run_briefly(self.loop)
@@ -405,13 +405,13 @@ def test_wait(self):
 if await ev.wait():
 result.append(3)
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
 
- t3 = asyncio.Task(c3(result), loop=self.loop)
+ t3 = self.loop.create_task(c3(result))
 
 ev.set()
 test_utils.run_briefly(self.loop)
@@ -436,7 +436,7 @@ def test_wait_cancel(self):
 with self.assertWarns(DeprecationWarning):
 ev = asyncio.Event(loop=self.loop)
 
- wait = asyncio.Task(ev.wait(), loop=self.loop)
+ wait = self.loop.create_task(ev.wait())
 self.loop.call_soon(wait.cancel)
 self.assertRaises(
 asyncio.CancelledError,
@@ -464,7 +464,7 @@ def test_clear_with_waiters(self):
 result.append(1)
 return True
 
- t = asyncio.Task(c1(result), loop=self.loop)
+ t = self.loop.create_task(c1(result))
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
 
@@ -527,9 +527,9 @@ def test_wait(self):
 result.append(3)
 return True
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
- t3 = asyncio.Task(c3(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
+ t3 = self.loop.create_task(c3(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
@@ -573,7 +573,7 @@ def test_wait_cancel(self):
 cond = asyncio.Condition(loop=self.loop)
 self.loop.run_until_complete(cond.acquire())
 
- wait = asyncio.Task(cond.wait(), loop=self.loop)
+ wait = self.loop.create_task(cond.wait())
 self.loop.call_soon(wait.cancel)
 self.assertRaises(
 asyncio.CancelledError,
@@ -588,7 +588,7 @@ def test_wait_cancel_contested(self):
 self.loop.run_until_complete(cond.acquire())
 self.assertTrue(cond.locked())
 
- wait_task = asyncio.Task(cond.wait(), loop=self.loop)
+ wait_task = self.loop.create_task(cond.wait())
 test_utils.run_briefly(self.loop)
 self.assertFalse(cond.locked())
 
@@ -657,7 +657,7 @@ def predicate():
 cond.release()
 return True
 
- t = asyncio.Task(c1(result), loop=self.loop)
+ t = self.loop.create_task(c1(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
@@ -717,9 +717,9 @@ def test_notify(self):
 cond.release()
 return True
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
- t3 = asyncio.Task(c3(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
+ t3 = self.loop.create_task(c3(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
@@ -764,8 +764,8 @@ def test_notify_all(self):
 cond.release()
 return True
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([], result)
@@ -965,9 +965,9 @@ def test_acquire(self):
 result.append(4)
 return True
 
- t1 = asyncio.Task(c1(result), loop=self.loop)
- t2 = asyncio.Task(c2(result), loop=self.loop)
- t3 = asyncio.Task(c3(result), loop=self.loop)
+ t1 = self.loop.create_task(c1(result))
+ t2 = self.loop.create_task(c2(result))
+ t3 = self.loop.create_task(c3(result))
 
 test_utils.run_briefly(self.loop)
 self.assertEqual([1], result)
@@ -975,7 +975,7 @@ def test_acquire(self):
 self.assertEqual(2, len(sem._waiters))
 self.assertEqual(0, sem._value)
 
- t4 = asyncio.Task(c4(result), loop=self.loop)
+ t4 = self.loop.create_task(c4(result))
 
 sem.release()
 sem.release()
@@ -1003,7 +1003,7 @@ def test_acquire_cancel(self):
 sem = asyncio.Semaphore(loop=self.loop)
 self.loop.run_until_complete(sem.acquire())
 
- acquire = asyncio.Task(sem.acquire(), loop=self.loop)
+ acquire = self.loop.create_task(sem.acquire())
 self.loop.call_soon(acquire.cancel)
 self.assertRaises(
 asyncio.CancelledError,
@@ -1015,10 +1015,10 @@ def test_acquire_cancel_before_awoken(self):
 with self.assertWarns(DeprecationWarning):
 sem = asyncio.Semaphore(value=0, loop=self.loop)
 
- t1 = asyncio.Task(sem.acquire(), loop=self.loop)
- t2 = asyncio.Task(sem.acquire(), loop=self.loop)
- t3 = asyncio.Task(sem.acquire(), loop=self.loop)
- t4 = asyncio.Task(sem.acquire(), loop=self.loop)
+ t1 = self.loop.create_task(sem.acquire())
+ t2 = self.loop.create_task(sem.acquire())
+ t3 = self.loop.create_task(sem.acquire())
+ t4 = self.loop.create_task(sem.acquire())
 
 test_utils.run_briefly(self.loop)
 
@@ -1038,8 +1038,8 @@ def test_acquire_hang(self):
 with self.assertWarns(DeprecationWarning):
 sem = asyncio.Semaphore(value=0, loop=self.loop)
 
- t1 = asyncio.Task(sem.acquire(), loop=self.loop)
- t2 = asyncio.Task(sem.acquire(), loop=self.loop)
+ t1 = self.loop.create_task(sem.acquire())
+ t2 = self.loop.create_task(sem.acquire())
 
 test_utils.run_briefly(self.loop)
 
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index dfb68b8e85d4..58a609444285 100644
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -206,7 +206,7 @@ def test_double_await(self):
 
 async def runner():
 coro = afunc()
- t = asyncio.Task(coro, loop=self.loop)
+ t = self.loop.create_task(coro)
 try:
 await asyncio.sleep(0)
 await coro
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index b2fd60683c57..c838c5ce85ae 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -47,7 +47,7 @@ def socket_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 tr = self.socket_transport(waiter=fut)
 test_utils.run_briefly(self.loop)
 self.assertIsNone(fut.result())
@@ -62,7 +62,7 @@ def test_loop_reading(self):
 self.assertFalse(self.protocol.eof_received.called)
 
 def test_loop_reading_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(b'data')
 
 tr = self.socket_transport()
@@ -72,7 +72,7 @@ def test_loop_reading_data(self):
 self.protocol.data_received.assert_called_with(b'data')
 
 def test_loop_reading_no_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(b'')
 
 tr = self.socket_transport()
@@ -182,7 +182,7 @@ def test_loop_writing_err(self, m_log):
 m_log.warning.assert_called_with('socket.send() raised exception.')
 
 def test_loop_writing_stop(self):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 fut.set_result(b'data')
 
 tr = self.socket_transport()
@@ -191,7 +191,7 @@ def test_loop_writing_stop(self):
 self.assertIsNone(tr._write_fut)
 
 def test_loop_writing_closing(self):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 fut.set_result(1)
 
 tr = self.socket_transport()
@@ -260,7 +260,7 @@ def test_force_close(self):
 def test_loop_writing_force_close(self):
 exc_handler = mock.Mock()
 self.loop.set_exception_handler(exc_handler)
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 fut.set_result(1)
 self.proactor.send.return_value = fut
 
@@ -303,7 +303,7 @@ def test_write_eof(self):
 
 def test_write_eof_buffer(self):
 tr = self.socket_transport()
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 tr._loop._proactor.send.return_value = f
 tr.write(b'data')
 tr.write_eof()
@@ -327,7 +327,7 @@ def test_write_eof_write_pipe(self):
 
 def test_write_eof_buffer_write_pipe(self):
 tr = _ProactorWritePipeTransport(self.loop, self.sock, self.protocol)
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 tr._loop._proactor.send.return_value = f
 tr.write(b'data')
 tr.write_eof()
@@ -352,7 +352,7 @@ def test_pause_resume_reading(self):
 tr = self.socket_transport()
 futures = []
 for msg in [b'data1', b'data2', b'data3', b'data4', b'data5', b'']:
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 f.set_result(msg)
 futures.append(f)
 
@@ -406,7 +406,7 @@ def test_pause_resume_writing(self):
 tr = self.pause_writing_transport(high=4)
 
 # write a large chunk, must pause writing
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 self.loop._proactor.send.return_value = fut
 tr.write(b'large data')
 self.loop._run_once()
@@ -422,7 +422,7 @@ def test_pause_writing_2write(self):
 tr = self.pause_writing_transport(high=4)
 
 # first short write, the buffer is not full (3 <= 4)
- fut1 = asyncio.Future(loop=self.loop)
+ fut1 = self.loop.create_future()
 self.loop._proactor.send.return_value = fut1
 tr.write(b'123')
 self.loop._run_once()
@@ -439,7 +439,7 @@ def test_pause_writing_3write(self):
 tr = self.pause_writing_transport(high=4)
 
 # first short write, the buffer is not full (1 <= 4)
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 self.loop._proactor.send.return_value = fut
 tr.write(b'1')
 self.loop._run_once()
@@ -463,7 +463,7 @@ def test_dont_pause_writing(self):
 
 # write a large chunk which completes immediately,
 # it should not pause writing
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 fut.set_result(None)
 self.loop._proactor.send.return_value = fut
 tr.write(b'very large data')
@@ -496,7 +496,7 @@ def socket_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 tr = self.socket_transport(waiter=fut)
 test_utils.run_briefly(self.loop)
 self.assertIsNone(fut.result())
@@ -541,7 +541,7 @@ def test_proto_type_switch(self):
 self.protocol = test_utils.make_test_protocol(asyncio.Protocol)
 tr = self.socket_transport()
 
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(b'data')
 
 tr = self.socket_transport()
@@ -558,7 +558,7 @@ def test_proto_type_switch(self):
 
 tr.set_protocol(buf_proto)
 test_utils.run_briefly(self.loop)
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(4)
 
 tr._read_fut = res
@@ -591,7 +591,7 @@ def test_buffer_updated_error(self):
 self.loop.call_exception_handler = mock.Mock()
 self.protocol.buffer_updated.side_effect = LookupError()
 
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(10)
 transport._read_fut = res
 transport._loop_reading(res)
@@ -601,7 +601,7 @@ def test_buffer_updated_error(self):
 self.assertTrue(self.protocol.buffer_updated.called)
 
 def test_loop_eof_received_error(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(0)
 
 self.protocol.eof_received.side_effect = LookupError()
@@ -617,7 +617,7 @@ def test_loop_eof_received_error(self):
 self.assertTrue(tr._fatal_error.called)
 
 def test_loop_reading_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(4)
 
 tr = self.socket_transport()
@@ -627,7 +627,7 @@ def test_loop_reading_data(self):
 self.protocol.buffer_updated.assert_called_with(4)
 
 def test_loop_reading_no_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result(0)
 
 tr = self.socket_transport()
@@ -691,7 +691,7 @@ def test_pause_resume_reading(self):
 tr = self.socket_transport()
 futures = []
 for msg in [10, 20, 30, 40, 0]:
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 f.set_result(msg)
 futures.append(f)
 
@@ -1044,7 +1044,7 @@ def test_create_server_cancel(self):
 loop = call_soon.call_args[0][0]
 
 # cancelled
- fut = asyncio.Future(loop=self.loop)
+ fut = self.loop.create_future()
 fut.cancel()
 loop(fut)
 self.assertTrue(self.sock.close.called)
@@ -1094,7 +1094,7 @@ def test_datagram_loop_reading(self):
 close_transport(tr)
 
 def test_datagram_loop_reading_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result((b'data', ('127.0.0.1', 12068)))
 
 tr = self.datagram_transport()
@@ -1105,7 +1105,7 @@ def test_datagram_loop_reading_data(self):
 close_transport(tr)
 
 def test_datagram_loop_reading_no_data(self):
- res = asyncio.Future(loop=self.loop)
+ res = self.loop.create_future()
 res.set_result((b'', ('127.0.0.1', 12068)))
 
 tr = self.datagram_transport()
diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
index 171176c9fc53..5c9aaa82c311 100644
--- a/Lib/test/test_asyncio/test_queues.py
+++ b/Lib/test/test_asyncio/test_queues.py
@@ -44,7 +44,7 @@ def gen():
 async def add_getter():
 q = asyncio.Queue(loop=loop)
 # Start a task that waits to get.
- asyncio.Task(q.get(), loop=loop)
+ loop.create_task(q.get())
 # Let it start waiting.
 await asyncio.sleep(0.1)
 self.assertTrue('_getters[1]' in fn(q))
@@ -58,7 +58,7 @@ def gen():
 q = asyncio.Queue(maxsize=1, loop=loop)
 q.put_nowait(1)
 # Start a task that waits to put.
- asyncio.Task(q.put(2), loop=loop)
+ loop.create_task(q.put(2))
 # Let it start waiting.
 await asyncio.sleep(0.1)
 self.assertTrue('_putters[1]' in fn(q))
@@ -143,7 +143,7 @@ def gen():
 return True
 
 async def test():
- t = asyncio.Task(putter(), loop=loop)
+ t = loop.create_task(putter())
 await asyncio.sleep(0.01)
 
 # The putter is blocked after putting two items.
@@ -181,7 +181,7 @@ def test_get_with_putters(self):
 q = asyncio.Queue(1, loop=self.loop)
 q.put_nowait(1)
 
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 q._putters.append(waiter)
 
 res = self.loop.run_until_complete(q.get())
@@ -212,7 +212,7 @@ def gen():
 
 async def queue_put():
 loop.call_later(0.01, q.put_nowait, 1)
- queue_get_task = asyncio.Task(queue_get(), loop=loop)
+ queue_get_task = loop.create_task(queue_get())
 await started.wait()
 self.assertFalse(finished)
 res = await queue_get_task
@@ -252,7 +252,7 @@ def gen():
 return await asyncio.wait_for(q.get(), 0.051)
 
 async def test():
- get_task = asyncio.Task(queue_get(), loop=loop)
+ get_task = loop.create_task(queue_get())
 await asyncio.sleep(0.01) # let the task start
 q.put_nowait(1)
 return await get_task
@@ -264,8 +264,8 @@ def test_get_cancelled_race(self):
 with self.assertWarns(DeprecationWarning):
 q = asyncio.Queue(loop=self.loop)
 
- t1 = asyncio.Task(q.get(), loop=self.loop)
- t2 = asyncio.Task(q.get(), loop=self.loop)
+ t1 = self.loop.create_task(q.get())
+ t2 = self.loop.create_task(q.get())
 
 test_utils.run_briefly(self.loop)
 t1.cancel()
@@ -278,8 +278,8 @@ def test_get_cancelled_race(self):
 def test_get_with_waiting_putters(self):
 with self.assertWarns(DeprecationWarning):
 q = asyncio.Queue(loop=self.loop, maxsize=1)
- asyncio.Task(q.put('a'), loop=self.loop)
- asyncio.Task(q.put('b'), loop=self.loop)
+ self.loop.create_task(q.put('a'))
+ self.loop.create_task(q.put('b'))
 test_utils.run_briefly(self.loop)
 self.assertEqual(self.loop.run_until_complete(q.get()), 'a')
 self.assertEqual(self.loop.run_until_complete(q.get()), 'b')
@@ -361,7 +361,7 @@ def gen():
 
 async def queue_get():
 loop.call_later(0.01, q.get_nowait)
- queue_put_task = asyncio.Task(queue_put(), loop=loop)
+ queue_put_task = loop.create_task(queue_put())
 await started.wait()
 self.assertFalse(finished)
 await queue_put_task
@@ -502,7 +502,7 @@ def test_put_cancelled(self):
 async def test():
 return await q.get()
 
- t = asyncio.Task(queue_put(), loop=self.loop)
+ t = self.loop.create_task(queue_put())
 self.assertEqual(1, self.loop.run_until_complete(test()))
 self.assertTrue(t.done())
 self.assertTrue(t.result())
@@ -511,9 +511,9 @@ def test_put_cancelled_race(self):
 with self.assertWarns(DeprecationWarning):
 q = asyncio.Queue(loop=self.loop, maxsize=1)
 
- put_a = asyncio.Task(q.put('a'), loop=self.loop)
- put_b = asyncio.Task(q.put('b'), loop=self.loop)
- put_c = asyncio.Task(q.put('X'), loop=self.loop)
+ put_a = self.loop.create_task(q.put('a'))
+ put_b = self.loop.create_task(q.put('b'))
+ put_c = self.loop.create_task(q.put('X'))
 
 test_utils.run_briefly(self.loop)
 self.assertTrue(put_a.done())
@@ -531,7 +531,7 @@ def test_put_cancelled_race(self):
 def test_put_with_waiting_getters(self):
 with self.assertWarns(DeprecationWarning):
 q = asyncio.Queue(loop=self.loop)
- t = asyncio.Task(q.get(), loop=self.loop)
+ t = self.loop.create_task(q.get())
 test_utils.run_briefly(self.loop)
 self.loop.run_until_complete(q.put('a'))
 self.assertEqual(self.loop.run_until_complete(t), 'a')
@@ -665,7 +665,7 @@ def test_task_done(self):
 q.task_done()
 
 async def test():
- tasks = [asyncio.Task(worker(), loop=self.loop)
+ tasks = [self.loop.create_task(worker())
 for index in range(2)]
 
 await q.join()
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index 68b7853b2eba..1613c753c26e 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -78,7 +78,7 @@ def test_make_ssl_transport(self):
 self.loop._add_writer = mock.Mock()
 self.loop._remove_reader = mock.Mock()
 self.loop._remove_writer = mock.Mock()
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 with test_utils.disable_logger():
 transport = self.loop._make_ssl_transport(
 m, asyncio.Protocol(), m, waiter)
@@ -154,7 +154,7 @@ def _make_self_pipe(self):
 self.loop.close()
 
 # operation blocked when the loop is closed
- f = asyncio.Future(loop=self.loop)
+ f = self.loop.create_future()
 self.assertRaises(RuntimeError, self.loop.run_forever)
 self.assertRaises(RuntimeError, self.loop.run_until_complete, f)
 fd = 0
@@ -516,7 +516,7 @@ def socket_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 tr = self.socket_transport(waiter=waiter)
 self.loop.run_until_complete(waiter)
 
@@ -525,7 +525,7 @@ def test_ctor(self):
 self.protocol.connection_made.assert_called_with(tr)
 
 def test_ctor_with_waiter(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 self.socket_transport(waiter=waiter)
 self.loop.run_until_complete(waiter)
 
@@ -911,7 +911,7 @@ def socket_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 tr = self.socket_transport(waiter=waiter)
 self.loop.run_until_complete(waiter)
 
diff --git a/Lib/test/test_asyncio/test_sock_lowlevel.py b/Lib/test/test_asyncio/test_sock_lowlevel.py
index 7b40a765e4a0..89c2af9f5ec0 100644
--- a/Lib/test/test_asyncio/test_sock_lowlevel.py
+++ b/Lib/test/test_asyncio/test_sock_lowlevel.py
@@ -16,8 +16,8 @@ def __init__(self, loop=None):
 self.state = 'INITIAL'
 self.nbytes = 0
 if loop is not None:
- self.connected = asyncio.Future(loop=loop)
- self.done = asyncio.Future(loop=loop)
+ self.connected = loop.create_future()
+ self.done = loop.create_future()
 
 def connection_made(self, transport):
 self.transport = transport
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 9457bc982b06..c115e46e705b 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -72,7 +72,7 @@ def test_handshake_timeout_negative(self):
 ssl_handshake_timeout=-10)
 
 def test_eof_received_waiter(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 self.connection_made(ssl_proto)
 ssl_proto.eof_received()
@@ -83,7 +83,7 @@ def test_fatal_error_no_name_error(self):
 # From issue #363.
 # _fatal_error() generates a NameError if sslproto.py
 # does not import base_events.
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 # Temporarily turn off error logging so as not to spoil test output.
 log_level = log.logger.getEffectiveLevel()
@@ -97,7 +97,7 @@ def test_fatal_error_no_name_error(self):
 def test_connection_lost(self):
 # From issue #472.
 # yield from waiter hang if lost_connection was called.
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 self.connection_made(ssl_proto)
 ssl_proto.connection_lost(ConnectionAbortedError)
@@ -106,7 +106,7 @@ def test_connection_lost(self):
 
 def test_close_during_handshake(self):
 # bpo-29743 Closing transport during handshake process leaks socket
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 
 transport = self.connection_made(ssl_proto)
@@ -116,7 +116,7 @@ def test_close_during_handshake(self):
 self.assertTrue(transport.abort.called)
 
 def test_get_extra_info_on_closed_connection(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 self.assertIsNone(ssl_proto._get_extra_info('socket'))
 default = object()
@@ -127,7 +127,7 @@ def test_get_extra_info_on_closed_connection(self):
 self.assertIsNone(ssl_proto._get_extra_info('socket'))
 
 def test_set_new_app_protocol(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 ssl_proto = self.ssl_protocol(waiter=waiter)
 new_app_proto = asyncio.Protocol()
 ssl_proto._app_transport.set_protocol(new_app_proto)
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 428c863d9fa6..60fe52fa4b37 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -192,7 +192,7 @@ def test_read(self):
 stream = asyncio.Stream(mode=asyncio.StreamMode.READ,
 loop=self.loop,
 _asyncio_internal=True)
- read_task = asyncio.Task(stream.read(30), loop=self.loop)
+ read_task = self.loop.create_task(stream.read(30))
 
 def cb():
 stream._feed_data(self.DATA)
@@ -220,7 +220,7 @@ def test_read_eof(self):
 stream = asyncio.Stream(mode=asyncio.StreamMode.READ,
 loop=self.loop,
 _asyncio_internal=True)
- read_task = asyncio.Task(stream.read(1024), loop=self.loop)
+ read_task = self.loop.create_task(stream.read(1024))
 
 def cb():
 stream._feed_eof()
@@ -235,7 +235,7 @@ def test_read_until_eof(self):
 stream = asyncio.Stream(mode=asyncio.StreamMode.READ,
 loop=self.loop,
 _asyncio_internal=True)
- read_task = asyncio.Task(stream.read(-1), loop=self.loop)
+ read_task = self.loop.create_task(stream.read(-1))
 
 def cb():
 stream._feed_data(b'chunk1\n')
@@ -288,7 +288,7 @@ def test_readline(self):
 loop=self.loop,
 _asyncio_internal=True)
 stream._feed_data(b'chunk1 ')
- read_task = asyncio.Task(stream.readline(), loop=self.loop)
+ read_task = self.loop.create_task(stream.readline())
 
 def cb():
 stream._feed_data(b'chunk2 ')
@@ -579,7 +579,7 @@ def test_readexactly(self):
 _asyncio_internal=True)
 
 n = 2 * len(self.DATA)
- read_task = asyncio.Task(stream.readexactly(n), loop=self.loop)
+ read_task = self.loop.create_task(stream.readexactly(n))
 
 def cb():
 stream._feed_data(self.DATA)
@@ -606,7 +606,7 @@ def test_readexactly_eof(self):
 loop=self.loop,
 _asyncio_internal=True)
 n = 2 * len(self.DATA)
- read_task = asyncio.Task(stream.readexactly(n), loop=self.loop)
+ read_task = self.loop.create_task(stream.readexactly(n))
 
 def cb():
 stream._feed_data(self.DATA)
@@ -652,8 +652,8 @@ def test_exception_waiter(self):
 async def set_err():
 stream._set_exception(ValueError())
 
- t1 = asyncio.Task(stream.readline(), loop=self.loop)
- t2 = asyncio.Task(set_err(), loop=self.loop)
+ t1 = self.loop.create_task(stream.readline())
+ t2 = self.loop.create_task(set_err())
 
 self.loop.run_until_complete(asyncio.wait([t1, t2]))
 
@@ -664,7 +664,7 @@ def test_exception_cancel(self):
 loop=self.loop,
 _asyncio_internal=True)
 
- t = asyncio.Task(stream.readline(), loop=self.loop)
+ t = self.loop.create_task(stream.readline())
 test_utils.run_briefly(self.loop)
 t.cancel()
 test_utils.run_briefly(self.loop)
@@ -735,8 +735,7 @@ def stop(self):
 server = MyServer(self.loop)
 with self.assertWarns(DeprecationWarning):
 addr = server.start()
- msg = self.loop.run_until_complete(asyncio.Task(client(addr),
- loop=self.loop))
+ msg = self.loop.run_until_complete(self.loop.create_task(client(addr)))
 server.stop()
 self.assertEqual(msg, b"hello world!\n")
 
@@ -744,8 +743,7 @@ def stop(self):
 server = MyServer(self.loop)
 with self.assertWarns(DeprecationWarning):
 addr = server.start_callback()
- msg = self.loop.run_until_complete(asyncio.Task(client(addr),
- loop=self.loop))
+ msg = self.loop.run_until_complete(self.loop.create_task(client(addr)))
 server.stop()
 self.assertEqual(msg, b"hello world!\n")
 
@@ -810,8 +808,8 @@ def stop(self):
 server = MyServer(self.loop, path)
 with self.assertWarns(DeprecationWarning):
 server.start()
- msg = self.loop.run_until_complete(asyncio.Task(client(path),
- loop=self.loop))
+ msg = self.loop.run_until_complete(
+ self.loop.create_task(client(path)))
 server.stop()
 self.assertEqual(msg, b"hello world!\n")
 
@@ -820,8 +818,8 @@ def stop(self):
 server = MyServer(self.loop, path)
 with self.assertWarns(DeprecationWarning):
 server.start_callback()
- msg = self.loop.run_until_complete(asyncio.Task(client(path),
- loop=self.loop))
+ msg = self.loop.run_until_complete(
+ self.loop.create_task(client(path)))
 server.stop()
 self.assertEqual(msg, b"hello world!\n")
 
@@ -1016,7 +1014,7 @@ def test___repr__waiter(self):
 stream = asyncio.Stream(mode=asyncio.StreamMode.READ,
 loop=self.loop,
 _asyncio_internal=True)
- stream._waiter = asyncio.Future(loop=self.loop)
+ stream._waiter = self.loop.create_future()
 self.assertRegex(
 repr(stream),
 r"<Stream .+ waiter=<Future pending[\S ]*>>")
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index b9578b2866c0..2cfe6576d623 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -43,7 +43,6 @@ def setUp(self):
 self.loop = self.new_test_loop()
 self.set_event_loop(self.loop)
 
-
 def create_transport(self, waiter=None):
 protocol = mock.Mock()
 protocol.connection_made._is_coroutine = False
@@ -54,7 +53,7 @@ def create_transport(self, waiter=None):
 return (transport, protocol)
 
 def test_proc_exited(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 transport, protocol = self.create_transport(waiter)
 transport._process_exited(6)
 self.loop.run_until_complete(waiter)
@@ -80,7 +79,7 @@ def test_proc_exited(self):
 transport.close()
 
 def test_subprocess_repr(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 transport, protocol = self.create_transport(waiter)
 transport._process_exited(6)
 self.loop.run_until_complete(waiter)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 323c0907a23a..3fbb2a1a1629 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2660,7 +2660,7 @@ def get_loop(self):
 try:
 fut = Fut(loop=self.loop)
 self.loop.call_later(0.1, fut.set_result, 1)
- task = asyncio.Task(coro(), loop=self.loop)
+ task = self.loop.create_task(coro())
 res = self.loop.run_until_complete(task)
 finally:
 self.loop.close()
@@ -2878,7 +2878,7 @@ def _run_loop(self, loop):
 test_utils.run_briefly(loop)
 
 def _check_success(self, **kwargs):
- a, b, c = [asyncio.Future(loop=self.one_loop) for i in range(3)]
+ a, b, c = [self.one_loop.create_future() for i in range(3)]
 fut = asyncio.gather(*self.wrap_futures(a, b, c), **kwargs)
 cb = test_utils.MockCallback()
 fut.add_done_callback(cb)
@@ -2900,7 +2900,7 @@ def test_result_exception_success(self):
 self._check_success(return_exceptions=True)
 
 def test_one_exception(self):
- a, b, c, d, e = [asyncio.Future(loop=self.one_loop) for i in range(5)]
+ a, b, c, d, e = [self.one_loop.create_future() for i in range(5)]
 fut = asyncio.gather(*self.wrap_futures(a, b, c, d, e))
 cb = test_utils.MockCallback()
 fut.add_done_callback(cb)
@@ -2918,7 +2918,7 @@ def test_one_exception(self):
 e.exception()
 
 def test_return_exceptions(self):
- a, b, c, d = [asyncio.Future(loop=self.one_loop) for i in range(4)]
+ a, b, c, d = [self.one_loop.create_future() for i in range(4)]
 fut = asyncio.gather(*self.wrap_futures(a, b, c, d),
 return_exceptions=True)
 cb = test_utils.MockCallback()
@@ -2991,15 +2991,15 @@ def test_constructor_empty_sequence(self):
 self._check_empty_sequence(iter(""))
 
 def test_constructor_heterogenous_futures(self):
- fut1 = asyncio.Future(loop=self.one_loop)
- fut2 = asyncio.Future(loop=self.other_loop)
+ fut1 = self.one_loop.create_future()
+ fut2 = self.other_loop.create_future()
 with self.assertRaises(ValueError):
 asyncio.gather(fut1, fut2)
 with self.assertRaises(ValueError):
 asyncio.gather(fut1, loop=self.other_loop)
 
 def test_constructor_homogenous_futures(self):
- children = [asyncio.Future(loop=self.other_loop) for i in range(3)]
+ children = [self.other_loop.create_future() for i in range(3)]
 fut = asyncio.gather(*children)
 self.assertIs(fut._loop, self.other_loop)
 self._run_loop(self.other_loop)
@@ -3010,7 +3010,7 @@ def test_constructor_homogenous_futures(self):
 self.assertFalse(fut.done())
 
 def test_one_cancellation(self):
- a, b, c, d, e = [asyncio.Future(loop=self.one_loop) for i in range(5)]
+ a, b, c, d, e = [self.one_loop.create_future() for i in range(5)]
 fut = asyncio.gather(a, b, c, d, e)
 cb = test_utils.MockCallback()
 fut.add_done_callback(cb)
@@ -3028,7 +3028,7 @@ def test_one_cancellation(self):
 e.exception()
 
 def test_result_exception_one_cancellation(self):
- a, b, c, d, e, f = [asyncio.Future(loop=self.one_loop)
+ a, b, c, d, e, f = [self.one_loop.create_future()
 for i in range(6)]
 fut = asyncio.gather(a, b, c, d, e, f, return_exceptions=True)
 cb = test_utils.MockCallback()
@@ -3094,7 +3094,7 @@ def coro(s):
 def test_cancellation_broadcast(self):
 # Cancelling outer() cancels all children.
 proof = 0
- waiter = asyncio.Future(loop=self.one_loop)
+ waiter = self.one_loop.create_future()
 
 async def inner():
 nonlocal proof
@@ -3130,8 +3130,8 @@ def test_exception_marking(self):
 await f
 raise RuntimeError('should not be ignored')
 
- a = asyncio.Future(loop=self.one_loop)
- b = asyncio.Future(loop=self.one_loop)
+ a = self.one_loop.create_future()
+ b = self.one_loop.create_future()
 
 async def outer():
 await asyncio.gather(inner(a), inner(b), loop=self.one_loop)
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 1daa870a7b27..02ce7e89da09 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -669,7 +669,7 @@ def read_pipe_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 tr = self.read_pipe_transport(waiter=waiter)
 self.loop.run_until_complete(waiter)
 
@@ -819,7 +819,7 @@ def write_pipe_transport(self, waiter=None):
 return transport
 
 def test_ctor(self):
- waiter = asyncio.Future(loop=self.loop)
+ waiter = self.loop.create_future()
 tr = self.write_pipe_transport(waiter=waiter)
 self.loop.run_until_complete(waiter)
 

---

• Previous message (by thread): [Python-checkins] bpo-38107: Replace direct future and task contructor calls with factories in asyncio tests (GH-15928)
• Next message (by thread): [Python-checkins] bpo-34519: Add additional aliases for HP Roman 8 (GH-8956)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list