summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-12-17 00:40:11 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-12-17 00:40:11 (GMT)
commite277a3dc5159b2ad61e57fa77bff485328864cc5 (patch)
treeee6dec819a4ad3b59e662428f66dead1b32ae90e
parenta3f82bad162f3b3361bfa520569bdd6b8d744c6c (diff)
parentaa78adc589d85eb6b87d2083ae9cd3797fb7a3d2 (diff)
downloadcpython-e277a3dc5159b2ad61e57fa77bff485328864cc5.zip
cpython-e277a3dc5159b2ad61e57fa77bff485328864cc5.tar.gz
cpython-e277a3dc5159b2ad61e57fa77bff485328864cc5.tar.bz2
Merge 3.4
-rw-r--r--Lib/test/test_asyncio/test_streams.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index b716a50..0a9762d 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -351,7 +351,7 @@ class StreamReaderTests(test_utils.TestCase):
self.assertEqual(b'', data)
self.assertEqual(self.DATA, stream._buffer)
- with self.assertRaisesRegexp(ValueError, 'less than zero'):
+ with self.assertRaisesRegex(ValueError, 'less than zero'):
self.loop.run_until_complete(stream.readexactly(-1))
self.assertEqual(self.DATA, stream._buffer)