From e6ecea53c8394b5101bb3ddab3216a948065ef97 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 9 Jul 2015 23:13:50 +0200 Subject: [PATCH] asyncio: sync with github asyncio * queues: get coroutine from asyncio.coroutines, not from asyncio.tasks * tets: replace tulip with asyncio in comments --- Lib/asyncio/queues.py | 2 +- Lib/test/test_asyncio/test_selector_events.py | 2 +- Lib/test/test_asyncio/test_streams.py | 6 +++--- Lib/test/test_asyncio/test_subprocess.py | 2 +- Lib/test/test_asyncio/test_windows_events.py | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py index ed116620b4a..3b4dc21ab86 100644 --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -9,7 +9,7 @@ import heapq from . import events from . import futures from . import locks -from .tasks import coroutine +from .coroutines import coroutine class QueueEmpty(Exception): diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py index 9478b954835..f0fcdd22ae6 100644 --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -348,7 +348,7 @@ class BaseSelectorEventLoopTests(test_utils.TestCase): self.loop._sock_connect.call_args[0]) def test_sock_connect_timeout(self): - # Tulip issue #205: sock_connect() must unregister the socket on + # asyncio issue #205: sock_connect() must unregister the socket on # timeout error # prepare mocks diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py index 2273049b815..242b377eb46 100644 --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -580,7 +580,7 @@ class StreamReaderTests(test_utils.TestCase): @unittest.skipIf(sys.platform == 'win32', "Don't have pipes") def test_read_all_from_pipe_reader(self): - # See Tulip issue 168. This test is derived from the example + # See asyncio issue 168. This test is derived from the example # subprocess_attach_read_pipe.py, but we configure the # StreamReader's limit so that twice it is less than the size # of the data writter. Also we must explicitly attach a child @@ -621,7 +621,7 @@ os.close(fd) self.addCleanup(asyncio.set_event_loop, None) asyncio.set_event_loop(self.loop) - # Tulip issue #184: Ensure that StreamReaderProtocol constructor + # asyncio issue #184: Ensure that StreamReaderProtocol constructor # retrieves the current loop if the loop parameter is not set reader = asyncio.StreamReader() self.assertIs(reader._loop, self.loop) @@ -630,7 +630,7 @@ os.close(fd) self.addCleanup(asyncio.set_event_loop, None) asyncio.set_event_loop(self.loop) - # Tulip issue #184: Ensure that StreamReaderProtocol constructor + # asyncio issue #184: Ensure that StreamReaderProtocol constructor # retrieves the current loop if the loop parameter is not set reader = mock.Mock() protocol = asyncio.StreamReaderProtocol(reader) diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 5ccdafb151f..ea85e1912e8 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -266,7 +266,7 @@ class SubprocessMixin: self.assertTrue(transport.resume_reading.called) def test_stdin_not_inheritable(self): - # Tulip issue #209: stdin must not be inheritable, otherwise + # asyncio issue #209: stdin must not be inheritable, otherwise # the Process.communicate() hangs @asyncio.coroutine def len_message(message): diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py index 657a4274347..7fcf4023eec 100644 --- a/Lib/test/test_asyncio/test_windows_events.py +++ b/Lib/test/test_asyncio/test_windows_events.py @@ -132,7 +132,8 @@ class ProactorTests(test_utils.TestCase): self.assertTrue(fut.result()) self.assertTrue(0 <= elapsed < 0.3, elapsed) - # Tulip issue #195: cancelling a done _WaitHandleFuture must not crash + # asyncio issue #195: cancelling a done _WaitHandleFuture + # must not crash fut.cancel() def test_wait_for_handle_cancel(self): @@ -149,7 +150,8 @@ class ProactorTests(test_utils.TestCase): elapsed = self.loop.time() - start self.assertTrue(0 <= elapsed < 0.1, elapsed) - # Tulip issue #195: cancelling a _WaitHandleFuture twice must not crash + # asyncio issue #195: cancelling a _WaitHandleFuture twice + # must not crash fut = self.loop._proactor.wait_for_handle(event) fut.cancel() fut.cancel()