Skip to content

bpo-38113: Update Python/ast.c to PEP-384#15975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Sep 11, 2019
Merged

bpo-38113: Update Python/ast.c to PEP-384 #15975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Python/ast.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -294,7 +294,7 @@ validate_expr(expr_ty exp, expr_context_ty ctx)
if (!validate_constant(exp->v.Constant.value)) {
PyErr_Format(PyExc_TypeError,
"got an invalid type in Constant: %s",
Py_TYPE(exp->v.Constant.value)->tp_name);
_PyType_Name(Py_TYPE(exp->v.Constant.value)));
return 0;
}
return 1;
Expand DownExpand Up@@ -618,12 +618,11 @@ new_identifier(const char *n, struct compiling *c)
identifier; if so, normalize to NFKC. */
if (!PyUnicode_IS_ASCII(id)) {
PyObject *id2;
_Py_IDENTIFIER(NFKC);
if (!c->c_normalize && !init_normalization(c)) {
Py_DECREF(id);
return NULL;
}
PyObject *form = _PyUnicode_FromId(&PyId_NFKC);
PyObject *form = PyUnicode_InternFromString("NFKC");
if (form == NULL) {
Py_DECREF(id);
return NULL;
Expand All@@ -637,7 +636,7 @@ new_identifier(const char *n, struct compiling *c)
PyErr_Format(PyExc_TypeError,
"unicodedata.normalize() must return a string, not "
"%.200s",
Py_TYPE(id2)->tp_name);
_PyType_Name(Py_TYPE(id2)));
Py_DECREF(id2);
return NULL;
}
Expand Down