[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4

[yury.selivanov]

https://hg.python.org/cpython/rev/4e263be33d4f
changeset:   99590:4e263be33d4f
branch:      3.5
parent:      99587:5629ccdfc874
parent:      99589:bc0dcc3d9ebe
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Dec 16 19:40:11 2015 -0500
summary:
  Merge 3.4

files:
  Lib/test/test_asyncio/test_streams.py |  2 +-
  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
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -351,7 +351,7 @@
         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)
 

-- 
Repository URL: https://hg.python.org/cpython