Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5

This commit is contained in:
Yury Selivanov 2015-12-11 11:33:21 -05:00
parent aa5dcd893c 7888e67027
commit 0f8475a008
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/asyncio/streams.py
View File

@ -494,6 +494,9 @@ class StreamReader:
@coroutine @coroutine
def readexactly(self, n): def readexactly(self, n):
if n < 0:
raise ValueError('readexactly size can not be less than zero')
if self._exception is not None: if self._exception is not None:
raise self._exception raise self._exception

4
Lib/test/test_asyncio/test_streams.py
View File

@ -351,8 +351,8 @@ class StreamReaderTests(test_utils.TestCase):
self.assertEqual(b'', data) self.assertEqual(b'', data)
self.assertEqual(self.DATA, stream._buffer) self.assertEqual(self.DATA, stream._buffer)
data = self.loop.run_until_complete(stream.readexactly(-1)) with self.assertRaisesRegexp(ValueError, 'less than zero'):
self.assertEqual(b'', data) self.loop.run_until_complete(stream.readexactly(-1))
self.assertEqual(self.DATA, stream._buffer) self.assertEqual(self.DATA, stream._buffer)
def test_readexactly(self): def test_readexactly(self):