summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-02-11 03:41:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-02-11 03:41:40 (GMT)
commit42ec031fe75601710b4edbfe7e617b97b4948de6 (patch)
tree934ebba39378be0ae2a5a63795d4069e953d915d /Python
parent04e24288e1b203280794795542a480277d19e820 (diff)
parentc2f665e721e4e4629cc4a2c5eb6464c3dc7325e3 (diff)
downloadcpython-42ec031fe75601710b4edbfe7e617b97b4948de6.zip
cpython-42ec031fe75601710b4edbfe7e617b97b4948de6.tar.gz
cpython-42ec031fe75601710b4edbfe7e617b97b4948de6.tar.bz2
merge 3.3 (#20588)
Diffstat (limited to 'Python')
-rw-r--r--Python/Python-ast.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e07a93f..44fdafc 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -7023,10 +7023,14 @@ PyObject* PyAST_mod2obj(mod_ty t)
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{
mod_ty res;
- PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type,
- (PyObject*)Interactive_type};
+ PyObject *req_type[3];
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 <= 2);
if (!init_types())