From 3a32e3bf880f0842ac73d18285f5a1caa902a2ca Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 1 Feb 2019 11:37:34 -0800 Subject: bpo-35766 follow-up: Kill half-support for FunctionType in PyAST_obj2mod (#11714) See https://github.com/python/cpython/pull/11645/files/229874c612df868e7ae3e997e159915f49d16542#r252631862 https://bugs.python.org/issue35766 --- Parser/asdl_c.py | 5 ++--- Python/Python-ast.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index a51a5db..1526995 100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1187,19 +1187,18 @@ PyObject* PyAST_mod2obj(mod_ty t) } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -/* and 3 for "func_type" */ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) { mod_ty res; PyObject *req_type[3]; - char *req_name[] = {"Module", "Expression", "Interactive", "FunctionType"}; + char *req_name[] = {"Module", "Expression", "Interactive"}; int isinstance; req_type[0] = (PyObject*)Module_type; req_type[1] = (PyObject*)Expression_type; req_type[2] = (PyObject*)Interactive_type; - assert(0 <= mode && mode <= 3); + assert(0 <= mode && mode <= 2); if (!init_types()) return NULL; diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 1a56e90..5467d19 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -8917,19 +8917,18 @@ PyObject* PyAST_mod2obj(mod_ty t) } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -/* and 3 for "func_type" */ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) { mod_ty res; PyObject *req_type[3]; - char *req_name[] = {"Module", "Expression", "Interactive", "FunctionType"}; + char *req_name[] = {"Module", "Expression", "Interactive"}; int isinstance; req_type[0] = (PyObject*)Module_type; req_type[1] = (PyObject*)Expression_type; req_type[2] = (PyObject*)Interactive_type; - assert(0 <= mode && mode <= 3); + assert(0 <= mode && mode <= 2); if (!init_types()) return NULL; -- cgit v0.12