merge 3.2

84e821e9 · Benjamin Peterson · 01d7eba3 · 496c53d8 · 84e821e9
Commit 84e821e9 authored Feb 19, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Objects/funcobject.c Objects/funcobject.c +1 -3

No files found.
--- 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;
 }