Restore exception pickle support. #1497319.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 44c8fd6..986d211 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -141,7 +141,17 @@
static PyObject *
BaseException_reduce(PyBaseExceptionObject *self)
{
- return PyTuple_Pack(3, self->ob_type, self->args, self->dict);
+ if (self->args && self->dict)
+ return PyTuple_Pack(3, self->ob_type, self->args, self->dict);
+ else if (self->args)
+ return PyTuple_Pack(2, self->ob_type, self->args);
+ else {
+ PyObject *res, *tup = PyTuple_New(0);
+ if (!tup) return NULL;
+ res = PyTuple_Pack(2, self->ob_type, tup);
+ Py_DECREF(tup);
+ return res;
+ }
}