diff -r 483096ef1cf6 Modules/pyexpat.c --- a/Modules/pyexpat.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Modules/pyexpat.c Wed Jan 29 17:56:15 2014 +0200 @@ -317,8 +317,7 @@ } else { if (trace_frame(tstate, f, PyTrace_RETURN, res) < 0) { - Py_XDECREF(res); - res = NULL; + Py_CLEAR(res); } } #else diff -r 483096ef1cf6 Modules/readline.c --- a/Modules/readline.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Modules/readline.c Wed Jan 29 17:56:15 2014 +0200 @@ -877,7 +877,7 @@ (r != Py_None && PyLong_AsLong(r) == -1 && PyErr_Occurred())) { goto error; } - Py_XDECREF(r); r=NULL; + Py_CLEAR(r); if (0) { error: diff -r 483096ef1cf6 Modules/signalmodule.c --- a/Modules/signalmodule.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Modules/signalmodule.c Wed Jan 29 17:56:15 2014 +0200 @@ -1305,12 +1305,9 @@ Py_XDECREF(func); } - Py_XDECREF(IntHandler); - IntHandler = NULL; - Py_XDECREF(DefaultHandler); - DefaultHandler = NULL; - Py_XDECREF(IgnoreHandler); - IgnoreHandler = NULL; + Py_CLEAR(IntHandler); + Py_CLEAR(DefaultHandler); + Py_CLEAR(IgnoreHandler); } diff -r 483096ef1cf6 Modules/syslogmodule.c --- a/Modules/syslogmodule.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Modules/syslogmodule.c Wed Jan 29 17:56:15 2014 +0200 @@ -197,8 +197,7 @@ { if (S_log_open) { closelog(); - Py_XDECREF(S_ident_o); - S_ident_o = NULL; + Py_CLEAR(S_ident_o); S_log_open = 0; } Py_INCREF(Py_None); diff -r 483096ef1cf6 Modules/zlibmodule.c --- a/Modules/zlibmodule.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Modules/zlibmodule.c Wed Jan 29 17:56:15 2014 +0200 @@ -463,8 +463,7 @@ } error: - Py_XDECREF(self); - self = NULL; + Py_CLEAR(self); success: return (PyObject*)self; } diff -r 483096ef1cf6 Python/ceval.c --- a/Python/ceval.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Python/ceval.c Wed Jan 29 17:56:15 2014 +0200 @@ -3189,8 +3189,7 @@ if (call_trace(tstate->c_tracefunc, tstate->c_traceobj, tstate, f, PyTrace_RETURN, retval)) { - Py_XDECREF(retval); - retval = NULL; + Py_CLEAR(retval); why = WHY_EXCEPTION; } } @@ -3209,8 +3208,7 @@ else if (call_trace(tstate->c_profilefunc, tstate->c_profileobj, tstate, f, PyTrace_RETURN, retval)) { - Py_XDECREF(retval); - retval = NULL; + Py_CLEAR(retval); /* why = WHY_EXCEPTION; */ } } diff -r 483096ef1cf6 Python/import.c --- a/Python/import.c Wed Jan 29 11:45:31 2014 +0200 +++ b/Python/import.c Wed Jan 29 17:56:15 2014 +0200 @@ -343,8 +343,7 @@ void _PyImport_Fini(void) { - Py_XDECREF(extensions); - extensions = NULL; + Py_CLEAR(extensions); #ifdef WITH_THREAD if (import_lock != NULL) { PyThread_free_lock(import_lock);