diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-11 11:32:59 -0500 |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-11 11:32:59 -0500 |
| commit | dddc781998da741511178c7cb4e303e3db5aac45 (patch) | |
| tree | 3953a4a1870e3761a1bd82cc42f8901f942eccc7 | |
| parent | 5e58600c42137cbf17938c7035ea5d41b3e860f6 (diff) | |
| download | cpython-git-dddc781998da741511178c7cb4e303e3db5aac45.tar.gz | |
asyncio: Sync with github
| -rw-r--r-- | Lib/asyncio/streams.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_streams.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py index 6b5e96aea2..9097e38271 100644 --- a/Lib/asyncio/streams.py +++ b/Lib/asyncio/streams.py @@ -494,6 +494,9 @@ class StreamReader: @coroutine def readexactly(self, n): + if n < 0: + raise ValueError('readexactly size can not be less than zero') + if self._exception is not None: raise self._exception diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py index 6f657ad5f8..b716a504de 100644 --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -351,8 +351,8 @@ class StreamReaderTests(test_utils.TestCase): self.assertEqual(b'', data) self.assertEqual(self.DATA, stream._buffer) - data = self.loop.run_until_complete(stream.readexactly(-1)) - self.assertEqual(b'', data) + with self.assertRaisesRegexp(ValueError, 'less than zero'): + self.loop.run_until_complete(stream.readexactly(-1)) self.assertEqual(self.DATA, stream._buffer) def test_readexactly(self): |
