mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.3 (#20588)

Browse source
This commit is contained in:
Benjamin Peterson 2014-02-10 22:41:40 -05:00
commit 42ec031fe7
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -13,6 +13,8 @@ Core and Builtins
- Issue #19255: The builtins module is restored to initial value before - Issue #19255: The builtins module is restored to initial value before
cleaning other modules. The sys and builtins modules are cleaned last. cleaning other modules. The sys and builtins modules are cleaned last.
- Issue #20588: Make Python-ast.c C89 compliant.
- Issue #20437: Fixed 22 potential bugs when deleting objects references. - Issue #20437: Fixed 22 potential bugs when deleting objects references.
- Issue #20500: Displaying an exception at interpreter shutdown no longer - Issue #20500: Displaying an exception at interpreter shutdown no longer

8
Parser/asdl_c.py
View file

@ -1203,10 +1203,14 @@ PyObject* PyAST_mod2obj(mod_ty t)
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{ {
mod_ty res; mod_ty res;
PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type, PyObject *req_type[3];
(PyObject*)Interactive_type};
char *req_name[] = {"Module", "Expression", "Interactive"}; char *req_name[] = {"Module", "Expression", "Interactive"};
int isinstance; 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); assert(0 <= mode && mode <= 2);
if (!init_types()) if (!init_types())

8
Python/Python-ast.c
View file

@ -7023,10 +7023,14 @@ PyObject* PyAST_mod2obj(mod_ty t)
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{ {
mod_ty res; mod_ty res;
PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type, PyObject *req_type[3];
(PyObject*)Interactive_type};
char *req_name[] = {"Module", "Expression", "Interactive"}; char *req_name[] = {"Module", "Expression", "Interactive"};
int isinstance; 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); assert(0 <= mode && mode <= 2);
if (!init_types()) if (!init_types())