[Python-checkins] bpo-35766 follow-up: Kill half-support for FunctionType in PyAST_obj2mod (#11714)

[Guido van Rossum]

https://github.com/python/cpython/commit/3a32e3bf880f0842ac73d18285f5a1caa902a2ca
commit: 3a32e3bf880f0842ac73d18285f5a1caa902a2ca
branch: master
author: Guido van Rossum <guido at python.org>
committer: GitHub <noreply at github.com>
date: 2019-02-01T11:37:34-08:00
summary:

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

files:
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index a51a5db73904..1526995e3f8b 100644
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1187,19 +1187,18 @@ class PartingShots(StaticVisitor):
 }
 
 /* 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 1a56e90bca09..5467d192ee69 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;