Skip to content

Commit

Permalink
Make Transport.resume_reading() and pause_reading() idempotent. Add i…
Browse files Browse the repository at this point in the history
…s_reading().

Fixes issue #93.
Implements python/cpython#528 asyncio change.
  • Loading branch information
1st1 committed Nov 17, 2017
1 parent 62723b7 commit e1b7a1a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
11 changes: 11 additions & 0 deletions tests/test_tcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,15 @@ async def test_client(addr):
t.set_protocol(p)

self.assertFalse(t._paused)
self.assertTrue(t.is_reading())
t.pause_reading()
t.pause_reading() # Check that it's OK to call it 2nd time.
self.assertTrue(t._paused)
self.assertFalse(t.is_reading())
t.resume_reading()
t.resume_reading() # Check that it's OK to call it 2nd time.
self.assertFalse(t._paused)
self.assertTrue(t.is_reading())

sock = t.get_extra_info('socket')
self.assertIs(sock, t.get_extra_info('socket'))
Expand Down Expand Up @@ -580,6 +585,12 @@ async def test_client(addr):
t.abort()
self.assertTrue(t._closing)

self.assertFalse(t.is_reading())
# Check that pause_reading and resume_reading don't raise
# errors if called after the transport is closed.
t.pause_reading()
t.resume_reading()

await fut

# Test that peername and sockname are available after
Expand Down
17 changes: 6 additions & 11 deletions uvloop/handles/stream.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -664,21 +664,16 @@ cdef class UVStream(UVBaseTransport):
def can_write_eof(self):
return True

def pause_reading(self):
self._ensure_alive()
def is_reading(self):
return self._is_reading()

if self._closing:
raise RuntimeError('Cannot pause_reading() when closing')
if not self._is_reading():
raise RuntimeError('Already paused')
def pause_reading(self):
if self._closing or not self._is_reading():
return
self._stop_reading()

def resume_reading(self):
self._ensure_alive()

if self._is_reading():
raise RuntimeError('Not paused')
if self._closing:
if self._is_reading() or self._closing:
return
self._start_reading()

Expand Down

0 comments on commit e1b7a1a

Please sign in to comment.