From 5562d9dc5dd9f9a7710a1530a114c215516d4700 Mon Sep 17 00:00:00 2001 From: Richard Oudkerk Date: Sat, 28 Jul 2012 17:45:28 +0100 Subject: Issue #1692335: Move initial args assignment to BaseException.__new__ to help pickling of naive subclasses. --- Objects/exceptions.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Objects/exceptions.c') diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 5c85f10444..b7e11f85bf 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -44,6 +44,12 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds) self->traceback = self->cause = self->context = NULL; self->suppress_context = 0; + if (args) { + self->args = args; + Py_INCREF(args); + return (PyObject *)self; + } + self->args = PyTuple_New(0); if (!self->args) { Py_DECREF(self); @@ -56,12 +62,15 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds) static int BaseException_init(PyBaseExceptionObject *self, PyObject *args, PyObject *kwds) { + PyObject *tmp; + if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds)) return -1; - Py_XDECREF(self->args); + tmp = self->args; self->args = args; Py_INCREF(self->args); + Py_XDECREF(tmp); return 0; } -- cgit v1.2.1