Rename Transport.pause/resume to pause_reading/pause_writing. Also relax timeout...

diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index c1347b7db5890ea64c598483cb79b90303a284db..665569f03a7e48b0f4fcf771537f46766fde44dd 100644 (file)
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -94,12 +94,12 @@ class _ProactorReadPipeTransport(_ProactorBasePipeTransport,
         self._paused = False
         self._loop.call_soon(self._loop_reading)
 
-    def pause(self):
-        assert not self._closing, 'Cannot pause() when closing'
+    def pause_reading(self):
+        assert not self._closing, 'Cannot pause_reading() when closing'
         assert not self._paused, 'Already paused'
         self._paused = True
 
-    def resume(self):
+    def resume_reading(self):
         assert self._paused, 'Not paused'
         self._paused = False
         if self._closing:

diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index e8ae8854835d8a635a40b6b812042bc33aa46cf1..2edac65bb52fd32cc5cc778229e26f6a415f2e3d 100644 (file)
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -406,13 +406,13 @@ class _SelectorSocketTransport(_SelectorTransport):
         if waiter is not None:
             self._loop.call_soon(waiter.set_result, None)
 
-    def pause(self):
-        assert not self._closing, 'Cannot pause() when closing'
+    def pause_reading(self):
+        assert not self._closing, 'Cannot pause_reading() when closing'
         assert not self._paused, 'Already paused'
         self._paused = True
         self._loop.remove_reader(self._sock_fd)
 
-    def resume(self):
+    def resume_reading(self):
         assert self._paused, 'Not paused'
         self._paused = False
         if self._closing:
@@ -590,19 +590,19 @@ class _SelectorSslTransport(_SelectorTransport):
         if self._waiter is not None:
             self._loop.call_soon(self._waiter.set_result, None)
 
-    def pause(self):
+    def pause_reading(self):
         # XXX This is a bit icky, given the comment at the top of
         # _on_ready().  Is it possible to evoke a deadlock?  I don't
         # know, although it doesn't look like it; write() will still
         # accept more data for the buffer and eventually the app will
-        # call resume() again, and things will flow again.
+        # call resume_reading() again, and things will flow again.
 
-        assert not self._closing, 'Cannot pause() when closing'
+        assert not self._closing, 'Cannot pause_reading() when closing'
         assert not self._paused, 'Already paused'
         self._paused = True
         self._loop.remove_reader(self._sock_fd)
 
-    def resume(self):
+    def resume_reading(self):
         assert self._paused, 'Not paused'
         self._paused = False
         if self._closing:

diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
index d0f12e81df9ab291a867c7633b720fdd34866504..9915aa5c283e20dcf620b11b89213ba135852cad 100644 (file)
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -106,7 +106,7 @@ class StreamReader:
     def _maybe_resume_transport(self):
         if self._paused and self.byte_count <= self.limit:
             self._paused = False
-            self._transport.resume()
+            self._transport.resume_reading()
 
     def feed_eof(self):
         self.eof = True
@@ -133,7 +133,7 @@ class StreamReader:
             not self._paused and
             self.byte_count > 2*self.limit):
             try:
-                self._transport.pause()
+                self._transport.pause_reading()
             except NotImplementedError:
                 # The transport can't be paused.
                 # We'll just have to buffer all data.

diff --git a/Lib/asyncio/transports.py b/Lib/asyncio/transports.py
index bf3adee73a4ddcb4f4d5c0d5c21a29c10b6cc2bd..f1a718000944411668f7b38c40f26f2c02c7a249 100644 (file)
--- a/Lib/asyncio/transports.py
+++ b/Lib/asyncio/transports.py
@@ -29,15 +29,15 @@ class BaseTransport:
 class ReadTransport(BaseTransport):
     """ABC for read-only transports."""
 
-    def pause(self):
+    def pause_reading(self):
         """Pause the receiving end.
 
         No data will be passed to the protocol's data_received()
-        method until resume() is called.
+        method until resume_reading() is called.
         """
         raise NotImplementedError
 
-    def resume(self):
+    def resume_reading(self):
         """Resume the receiving end.
 
         Data received will once again be passed to the protocol's

diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 34b2aea0239c4281bb5b40872c0c129380cd70c5..a234f4fac13a190706fb2ab30563c0bab8dd0485 100644 (file)
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -232,10 +232,10 @@ class _UnixReadPipeTransport(transports.ReadTransport):
                 self._loop.call_soon(self._protocol.eof_received)
                 self._loop.call_soon(self._call_connection_lost, None)
 
-    def pause(self):
+    def pause_reading(self):
         self._loop.remove_reader(self._fileno)
 
-    def resume(self):
+    def resume_reading(self):
         self._loop.add_reader(self._fileno, self._read_ready)
 
     def close(self):

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index a9a9271283ccfe0df5f94ac1b7b73fd5a12e3189..2e89f72c04c962feb6b078807d5b0cdc6228b5b8 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -238,7 +238,7 @@ class EventLoopTestsMixin:
         self.loop.run_forever()
         t1 = time.monotonic()
         self.assertEqual(results, ['hello world'])
-        self.assertTrue(0.09 <= t1-t0 <= 0.12, t1-t0)
+        self.assertTrue(0.08 <= t1-t0 <= 0.2, t1-t0)
 
     def test_call_soon(self):
         results = []

diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index e4dd609c085b814c3554100b46673dbf8f8eaae9..05d1606c073bc7967ab475326ecb3c6263e85e30 100644 (file)
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -308,7 +308,7 @@ class ProactorSocketTransportTests(unittest.TestCase):
             tr.write_eof()
         tr.close()
 
-    def test_pause_resume(self):
+    def test_pause_resume_reading(self):
         tr = _ProactorSocketTransport(
             self.loop, self.sock, self.protocol)
         futures = []
@@ -323,12 +323,12 @@ class ProactorSocketTransportTests(unittest.TestCase):
         self.protocol.data_received.assert_called_with(b'data1')
         self.loop._run_once()
         self.protocol.data_received.assert_called_with(b'data2')
-        tr.pause()
+        tr.pause_reading()
         self.assertTrue(tr._paused)
         for i in range(10):
             self.loop._run_once()
         self.protocol.data_received.assert_called_with(b'data2')
-        tr.resume()
+        tr.resume_reading()
         self.assertFalse(tr._paused)
         self.loop._run_once()
         self.protocol.data_received.assert_called_with(b'data3')

diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index 1465cd243d04bbd560fe3fc52b54eb530c46c68d..53728b8d5e9b566333e9c9c9d858243dcd1a91f0 100644 (file)
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -676,15 +676,15 @@ class SelectorSocketTransportTests(unittest.TestCase):
         test_utils.run_briefly(self.loop)
         self.assertIsNone(fut.result())
 
-    def test_pause_resume(self):
+    def test_pause_resume_reading(self):
         tr = _SelectorSocketTransport(
             self.loop, self.sock, self.protocol)
         self.assertFalse(tr._paused)
         self.loop.assert_reader(7, tr._read_ready)
-        tr.pause()
+        tr.pause_reading()
         self.assertTrue(tr._paused)
         self.assertFalse(7 in self.loop.readers)
-        tr.resume()
+        tr.resume_reading()
         self.assertFalse(tr._paused)
         self.loop.assert_reader(7, tr._read_ready)
 
@@ -1044,14 +1044,14 @@ class SelectorSslTransportTests(unittest.TestCase):
         self.assertTrue(transport._waiter.done())
         self.assertIs(exc, transport._waiter.exception())
 
-    def test_pause_resume(self):
+    def test_pause_resume_reading(self):
         tr = self._make_one()
         self.assertFalse(tr._paused)
         self.loop.assert_reader(1, tr._on_ready)
-        tr.pause()
+        tr.pause_reading()
         self.assertTrue(tr._paused)
         self.assertFalse(1 in self.loop.readers)
-        tr.resume()
+        tr.resume_reading()
         self.assertFalse(tr._paused)
         self.loop.assert_reader(1, tr._on_ready)
 

diff --git a/Lib/test/test_asyncio/test_transports.py b/Lib/test/test_asyncio/test_transports.py
index fce2e6f5ade32a036c271f0a8ee6f89b915b01d7..53071afdfc2a55af89898ff5b3632369e7e9450b 100644 (file)
--- a/Lib/test/test_asyncio/test_transports.py
+++ b/Lib/test/test_asyncio/test_transports.py
@@ -33,8 +33,8 @@ class TransportTests(unittest.TestCase):
         self.assertRaises(NotImplementedError, transport.write, 'data')
         self.assertRaises(NotImplementedError, transport.write_eof)
         self.assertRaises(NotImplementedError, transport.can_write_eof)
-        self.assertRaises(NotImplementedError, transport.pause)
-        self.assertRaises(NotImplementedError, transport.resume)
+        self.assertRaises(NotImplementedError, transport.pause_reading)
+        self.assertRaises(NotImplementedError, transport.resume_reading)
         self.assertRaises(NotImplementedError, transport.close)
         self.assertRaises(NotImplementedError, transport.abort)
 

diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 227366d94942b0e456e8e743ba199c724ca75fb8..ccabeea13e13b57c6586864decffb6f00271ef82 100644 (file)
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -375,21 +375,21 @@ class UnixReadPipeTransportTests(unittest.TestCase):
         m_logexc.assert_called_with('Fatal error for %s', tr)
 
     @unittest.mock.patch('os.read')
-    def test_pause(self, m_read):
+    def test_pause_reading(self, m_read):
         tr = unix_events._UnixReadPipeTransport(
             self.loop, self.pipe, self.protocol)
 
         m = unittest.mock.Mock()
         self.loop.add_reader(5, m)
-        tr.pause()
+        tr.pause_reading()
         self.assertFalse(self.loop.readers)
 
     @unittest.mock.patch('os.read')
-    def test_resume(self, m_read):
+    def test_resume_reading(self, m_read):
         tr = unix_events._UnixReadPipeTransport(
             self.loop, self.pipe, self.protocol)
 
-        tr.resume()
+        tr.resume_reading()
         self.loop.assert_reader(5, tr._read_ready)
 
     @unittest.mock.patch('os.read')