From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Feb 2012 06:14:21 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84e821e961b5f0ea288f7f200902c24ec4f523bc;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

84e821e961b5f0ea288f7f200902c24ec4f523bc
diff --cc Objects/funcobject.c
index 5db86a6721b3,2292a9ec9847..6cbf297c5867
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@@ -965,10 -889,7 +965,8 @@@ sm_traverse(staticmethod *sm, visitpro
  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;
  }