[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/7cba5bddc0ad
changeset:   75030:7cba5bddc0ad
parent:      75028:f46deae68e34
parent:      75029:ddaf9a2a1d63
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Feb 19 01:14:21 2012 -0500
summary:
  merge 3.2

files:
  Objects/funcobject.c |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Objects/funcobject.c b/Objects/funcobject.c
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -965,10 +965,8 @@
 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;
 }
 

-- 
Repository URL: http://hg.python.org/cpython