traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.6 (issue #27243)

This commit is contained in:
Yury Selivanov 2016-11-08 15:15:42 -05:00
parent 64d84c60e2 2edd8a1e2c
commit 0ee446c894
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/test/test_coroutines.py
View File

@ -1398,7 +1398,7 @@ class CoroutineTest(unittest.TestCase):
buffer = []
async def test1():
with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"):
with self.assertWarnsRegex(DeprecationWarning, "legacy"):
async for i1, i2 in AsyncIter():
buffer.append(i1 + i2)
@ -1412,7 +1412,7 @@ class CoroutineTest(unittest.TestCase):
buffer = []
async def test2():
nonlocal buffer
with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"):
with self.assertWarnsRegex(DeprecationWarning, "legacy"):
async for i in AsyncIter():
buffer.append(i[0])
if i[0] == 20:
@ -1431,7 +1431,7 @@ class CoroutineTest(unittest.TestCase):
buffer = []
async def test3():
nonlocal buffer
with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"):
with self.assertWarnsRegex(DeprecationWarning, "legacy"):
async for i in AsyncIter():
if i[0] > 20:
continue
@ -1514,7 +1514,7 @@ class CoroutineTest(unittest.TestCase):
return 123
async def foo():
with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"):
with self.assertWarnsRegex(DeprecationWarning, "legacy"):
async for i in I():
print('never going to happen')
@ -1623,7 +1623,7 @@ class CoroutineTest(unittest.TestCase):
1/0
async def foo():
nonlocal CNT
with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"):
with self.assertWarnsRegex(DeprecationWarning, "legacy"):
async for i in AI():
CNT += 1
CNT += 10
@ -1650,7 +1650,7 @@ class CoroutineTest(unittest.TestCase):
self.assertEqual(CNT, 0)
def test_for_9(self):
# Test that PendingDeprecationWarning can safely be converted into
# Test that DeprecationWarning can safely be converted into
# an exception (__aiter__ should not have a chance to raise
# a ZeroDivisionError.)
class AI:
@ -1660,13 +1660,13 @@ class CoroutineTest(unittest.TestCase):
async for i in AI():
pass
with self.assertRaises(PendingDeprecationWarning):
with self.assertRaises(DeprecationWarning):
with warnings.catch_warnings():
warnings.simplefilter("error")
run_async(foo())
def test_for_10(self):
# Test that PendingDeprecationWarning can safely be converted into
# Test that DeprecationWarning can safely be converted into
# an exception.
class AI:
async def __aiter__(self):
@ -1675,7 +1675,7 @@ class CoroutineTest(unittest.TestCase):
async for i in AI():
pass
with self.assertRaises(PendingDeprecationWarning):
with self.assertRaises(DeprecationWarning):
with warnings.catch_warnings():
warnings.simplefilter("error")
run_async(foo())

2
Python/ceval.c
View File

@ -1917,7 +1917,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
Py_DECREF(iter);
if (PyErr_WarnFormat(
PyExc_PendingDeprecationWarning, 1,
PyExc_DeprecationWarning, 1,
"'%.100s' implements legacy __aiter__ protocol; "
"__aiter__ should return an asynchronous "
"iterator, not awaitable",