diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-19 06:14:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-19 06:14:21 (GMT) |
| commit | 84e821e961b5f0ea288f7f200902c24ec4f523bc (patch) | |
| tree | ebe64df4ef9f498f6180d81178c8163afeca9c35 | |
| parent | 01d7eba3162af8a0f62d7636cbb44440901b3909 (diff) | |
| parent | 496c53d83e736c54d3790c61b0d389df286c0a27 (diff) | |
| download | cpython-84e821e961b5f0ea288f7f200902c24ec4f523bc.zip cpython-84e821e961b5f0ea288f7f200902c24ec4f523bc.tar.gz cpython-84e821e961b5f0ea288f7f200902c24ec4f523bc.tar.bz2 | |
merge 3.2
| -rw-r--r-- | Objects/funcobject.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 5db86a6..6cbf297 100644 --- 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; } |