Skip to content
This repository was archived by the owner on Nov 23, 2017. It is now read-only.

Commit aaa348f

Browse files
gvanrossumgvanrossum
committed
Merge
1 parent 4408d67 commit aaa348f

9 files changed

+32
-32
lines changed

‎asyncio/proactor_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ def __init__(self, loop, sock, protocol, waiter=None,
9494
self._paused = False
9595
self._loop.call_soon(self._loop_reading)
9696

97-
def pause(self):
98-
assert not self._closing, 'Cannot pause() when closing'
97+
def pause_reading(self):
98+
assert not self._closing, 'Cannot pause_reading() when closing'
9999
assert not self._paused, 'Already paused'
100100
self._paused = True
101101

102-
def resume(self):
102+
def resume_reading(self):
103103
assert self._paused, 'Not paused'
104104
self._paused = False
105105
if self._closing:

‎asyncio/selector_events.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,13 @@ def __init__(self, loop, sock, protocol, waiter=None,
406406
if waiter is not None:
407407
self._loop.call_soon(waiter.set_result, None)
408408

409-
def pause(self):
410-
assert not self._closing, 'Cannot pause() when closing'
409+
def pause_reading(self):
410+
assert not self._closing, 'Cannot pause_reading() when closing'
411411
assert not self._paused, 'Already paused'
412412
self._paused = True
413413
self._loop.remove_reader(self._sock_fd)
414414

415-
def resume(self):
415+
def resume_reading(self):
416416
assert self._paused, 'Not paused'
417417
self._paused = False
418418
if self._closing:
@@ -590,19 +590,19 @@ def _on_handshake(self):
590590
if self._waiter is not None:
591591
self._loop.call_soon(self._waiter.set_result, None)
592592

593-
def pause(self):
593+
def pause_reading(self):
594594
# XXX This is a bit icky, given the comment at the top of
595595
# _on_ready(). Is it possible to evoke a deadlock? I don't
596596
# know, although it doesn't look like it; write() will still
597597
# accept more data for the buffer and eventually the app will
598-
# call resume() again, and things will flow again.
598+
# call resume_reading() again, and things will flow again.
599599

600-
assert not self._closing, 'Cannot pause() when closing'
600+
assert not self._closing, 'Cannot pause_reading() when closing'
601601
assert not self._paused, 'Already paused'
602602
self._paused = True
603603
self._loop.remove_reader(self._sock_fd)
604604

605-
def resume(self):
605+
def resume_reading(self):
606606
assert self._paused, 'Not paused'
607607
self._paused = False
608608
if self._closing:

‎asyncio/streams.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def set_transport(self, transport):
106106
def _maybe_resume_transport(self):
107107
if self._paused and self.byte_count <= self.limit:
108108
self._paused = False
109-
self._transport.resume()
109+
self._transport.resume_reading()
110110

111111
def feed_eof(self):
112112
self.eof = True
@@ -133,7 +133,7 @@ def feed_data(self, data):
133133
not self._paused and
134134
self.byte_count > 2*self.limit):
135135
try:
136-
self._transport.pause()
136+
self._transport.pause_reading()
137137
except NotImplementedError:
138138
# The transport can't be paused.
139139
# We'll just have to buffer all data.

‎asyncio/transports.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ def close(self):
2929
class ReadTransport(BaseTransport):
3030
"""ABC for read-only transports."""
3131

32-
def pause(self):
32+
def pause_reading(self):
3333
"""Pause the receiving end.
3434
3535
No data will be passed to the protocol's data_received()
36-
method until resume() is called.
36+
method until resume_reading() is called.
3737
"""
3838
raise NotImplementedError
3939

40-
def resume(self):
40+
def resume_reading(self):
4141
"""Resume the receiving end.
4242
4343
Data received will once again be passed to the protocol's

‎asyncio/unix_events.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ def _read_ready(self):
232232
self._loop.call_soon(self._protocol.eof_received)
233233
self._loop.call_soon(self._call_connection_lost, None)
234234

235-
def pause(self):
235+
def pause_reading(self):
236236
self._loop.remove_reader(self._fileno)
237237

238-
def resume(self):
238+
def resume_reading(self):
239239
self._loop.add_reader(self._fileno, self._read_ready)
240240

241241
def close(self):

‎tests/test_proactor_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def test_write_eof_duplex_pipe(self):
308308
tr.write_eof()
309309
tr.close()
310310

311-
def test_pause_resume(self):
311+
def test_pause_resume_reading(self):
312312
tr = _ProactorSocketTransport(
313313
self.loop, self.sock, self.protocol)
314314
futures = []
@@ -323,12 +323,12 @@ def test_pause_resume(self):
323323
self.protocol.data_received.assert_called_with(b'data1')
324324
self.loop._run_once()
325325
self.protocol.data_received.assert_called_with(b'data2')
326-
tr.pause()
326+
tr.pause_reading()
327327
self.assertTrue(tr._paused)
328328
for i in range(10):
329329
self.loop._run_once()
330330
self.protocol.data_received.assert_called_with(b'data2')
331-
tr.resume()
331+
tr.resume_reading()
332332
self.assertFalse(tr._paused)
333333
self.loop._run_once()
334334
self.protocol.data_received.assert_called_with(b'data3')

‎tests/test_selector_events.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,15 +676,15 @@ def test_ctor_with_waiter(self):
676676
test_utils.run_briefly(self.loop)
677677
self.assertIsNone(fut.result())
678678

679-
def test_pause_resume(self):
679+
def test_pause_resume_reading(self):
680680
tr = _SelectorSocketTransport(
681681
self.loop, self.sock, self.protocol)
682682
self.assertFalse(tr._paused)
683683
self.loop.assert_reader(7, tr._read_ready)
684-
tr.pause()
684+
tr.pause_reading()
685685
self.assertTrue(tr._paused)
686686
self.assertFalse(7 in self.loop.readers)
687-
tr.resume()
687+
tr.resume_reading()
688688
self.assertFalse(tr._paused)
689689
self.loop.assert_reader(7, tr._read_ready)
690690

@@ -1044,14 +1044,14 @@ def test_on_handshake_base_exc(self):
10441044
self.assertTrue(transport._waiter.done())
10451045
self.assertIs(exc, transport._waiter.exception())
10461046

1047-
def test_pause_resume(self):
1047+
def test_pause_resume_reading(self):
10481048
tr = self._make_one()
10491049
self.assertFalse(tr._paused)
10501050
self.loop.assert_reader(1, tr._on_ready)
1051-
tr.pause()
1051+
tr.pause_reading()
10521052
self.assertTrue(tr._paused)
10531053
self.assertFalse(1 in self.loop.readers)
1054-
tr.resume()
1054+
tr.resume_reading()
10551055
self.assertFalse(tr._paused)
10561056
self.loop.assert_reader(1, tr._on_ready)
10571057

‎tests/test_transports.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def test_not_implemented(self):
3333
self.assertRaises(NotImplementedError, transport.write, 'data')
3434
self.assertRaises(NotImplementedError, transport.write_eof)
3535
self.assertRaises(NotImplementedError, transport.can_write_eof)
36-
self.assertRaises(NotImplementedError, transport.pause)
37-
self.assertRaises(NotImplementedError, transport.resume)
36+
self.assertRaises(NotImplementedError, transport.pause_reading)
37+
self.assertRaises(NotImplementedError, transport.resume_reading)
3838
self.assertRaises(NotImplementedError, transport.close)
3939
self.assertRaises(NotImplementedError, transport.abort)
4040

‎tests/test_unix_events.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,21 +375,21 @@ def test__read_ready_error(self, m_read, m_logexc):
375375
m_logexc.assert_called_with('Fatal error for %s', tr)
376376

377377
@unittest.mock.patch('os.read')
378-
def test_pause(self, m_read):
378+
def test_pause_reading(self, m_read):
379379
tr = unix_events._UnixReadPipeTransport(
380380
self.loop, self.pipe, self.protocol)
381381

382382
m = unittest.mock.Mock()
383383
self.loop.add_reader(5, m)
384-
tr.pause()
384+
tr.pause_reading()
385385
self.assertFalse(self.loop.readers)
386386

387387
@unittest.mock.patch('os.read')
388-
def test_resume(self, m_read):
388+
def test_resume_reading(self, m_read):
389389
tr = unix_events._UnixReadPipeTransport(
390390
self.loop, self.pipe, self.protocol)
391391

392-
tr.resume()
392+
tr.resume_reading()
393393
self.loop.assert_reader(5, tr._read_ready)
394394

395395
@unittest.mock.patch('os.read')

0 commit comments

Comments
 (0)