Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-33677: Fix signatures of tp_clear handlers for AST and deque. (GH-7196)

This commit is contained in:
Serhiy Storchaka 2018-05-31 07:34:34 +03:00 committed by GitHub
parent 5d6c7ed5e3
commit a5c42284e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/_collectionsmodule.c
View File

@ -575,7 +575,7 @@ deque_concat(dequeobject *deque, PyObject *other)
return new_deque; return new_deque;
} }
static void static int
deque_clear(dequeobject *deque) deque_clear(dequeobject *deque)
{ {
block *b; block *b;
@ -587,7 +587,7 @@ deque_clear(dequeobject *deque)
PyObject **itemptr, **limit; PyObject **itemptr, **limit;
if (Py_SIZE(deque) == 0) if (Py_SIZE(deque) == 0)
return; return 0;
/* During the process of clearing a deque, decrefs can cause the /* During the process of clearing a deque, decrefs can cause the
deque to mutate. To avoid fatal confusion, we have to make the deque to mutate. To avoid fatal confusion, we have to make the
@ -648,7 +648,7 @@ deque_clear(dequeobject *deque)
} }
CHECK_END(leftblock->rightlink); CHECK_END(leftblock->rightlink);
freeblock(leftblock); freeblock(leftblock);
return; return 0;
alternate_method: alternate_method:
while (Py_SIZE(deque)) { while (Py_SIZE(deque)) {
@ -656,6 +656,7 @@ deque_clear(dequeobject *deque)
assert (item != NULL); assert (item != NULL);
Py_DECREF(item); Py_DECREF(item);
} }
return 0;
} }
static PyObject * static PyObject *

3
Parser/asdl_c.py
View File

@ -647,10 +647,11 @@ ast_traverse(AST_object *self, visitproc visit, void *arg)
return 0; return 0;
} }
static void static int
ast_clear(AST_object *self) ast_clear(AST_object *self)
{ {
Py_CLEAR(self->dict); Py_CLEAR(self->dict);
return 0;
} }
static int static int

3
Python/Python-ast.c
View File

@ -528,10 +528,11 @@ ast_traverse(AST_object *self, visitproc visit, void *arg)
return 0; return 0;
} }
static void static int
ast_clear(AST_object *self) ast_clear(AST_object *self)
{ {
Py_CLEAR(self->dict); Py_CLEAR(self->dict);
return 0;
} }
static int static int