merge 3.2

xzy3 · Feb 19, 2012 · 84e821e · 84e821e
2 parents 01d7eba + 496c53d
commit 84e821e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -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;
 }