Merge 3.6 (issue #27243)

This commit is contained in:
Yury Selivanov 2016-11-08 15:15:42 -05:00
commit 0ee446c894
2 changed files with 10 additions and 10 deletions

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",