merge 3.2

This commit is contained in:
Benjamin Peterson 2012-02-19 01:14:21 -05:00
commit 84e821e961
1 changed files with 1 additions and 3 deletions

View File

@ -965,10 +965,8 @@ sm_traverse(staticmethod *sm, visitproc visit, void *arg)
static int
sm_clear(staticmethod *sm)
{
Py_XDECREF(sm->sm_callable);
sm->sm_callable = NULL;
Py_CLEAR(sm->sm_callable);
Py_CLEAR(sm->sm_dict);
return 0;
}