mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.6 (issue #26182)

Browse source
This commit is contained in:
Yury Selivanov 2016-11-08 16:54:39 -05:00
commit 228722ad20
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -109,6 +109,8 @@ Core and Builtins
- Issue #26182: Raise DeprecationWarning when async and await keywords are - Issue #26182: Raise DeprecationWarning when async and await keywords are
used as variable/attribute/class/function name. used as variable/attribute/class/function name.
- Issue #26182: Fix ia refleak in code that raises DeprecationWarning.
Library Library
------- -------

8
Python/ast.c
View file

@ -944,17 +944,19 @@ forbidden_name(struct compiling *c, identifier name, const node *n,
PyObject *message = PyUnicode_FromString( PyObject *message = PyUnicode_FromString(
"'async' and 'await' will become reserved keywords" "'async' and 'await' will become reserved keywords"
" in Python 3.7"); " in Python 3.7");
int ret;
if (message == NULL) { if (message == NULL) {
return 1; return 1;
} }
if (PyErr_WarnExplicitObject( ret = PyErr_WarnExplicitObject(
PyExc_DeprecationWarning, PyExc_DeprecationWarning,
message, message,
c->c_filename, c->c_filename,
LINENO(n), LINENO(n),
NULL, NULL,
NULL) < 0) NULL);
{ Py_DECREF(message);
if (ret < 0) {
return 1; return 1;
} }
} }