merge 3.3

This commit is contained in:
Benjamin Peterson 2013-01-19 14:58:51 -05:00
commit f0472f6995
1 changed files with 0 additions and 7 deletions

View File

@ -156,7 +156,6 @@ PyArena_New()
void
PyArena_Free(PyArena *arena)
{
int r;
assert(arena);
#if defined(Py_DEBUG)
/*
@ -173,12 +172,6 @@ PyArena_Free(PyArena *arena)
assert(arena->a_objects->ob_refcnt == 1);
*/
/* Clear all the elements from the list. This is necessary
to guarantee that they will be DECREFed. */
r = PyList_SetSlice(arena->a_objects,
0, PyList_GET_SIZE(arena->a_objects), NULL);
assert(r == 0);
assert(PyList_GET_SIZE(arena->a_objects) == 0);
Py_DECREF(arena->a_objects);
free(arena);
}