Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-27015: Save kwargs given to exceptions constructor #11580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
remilapeyre wants to merge 9 commits into from
Closed

bpo-27015: Save kwargs given to exceptions constructor #11580

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a00f21
Save kwargs given to exceptions constructor
Jan 15, 2019
12dc912
fix NEWS entry typo and formatting
gpshead Jan 16, 2019
1d12d28
Move CalledProcessError pickling test to test_subprocess
Jan 16, 2019
88ba13e
Fix tuple size
Jan 16, 2019
9986e86
Create self.kwargs only if accessed
Jan 16, 2019
7794862
Fix coding style issues and use Python memory allocator
Jan 28, 2019
6c906da
Implement BaseException.__getnewargs_ex__
Feb 20, 2019
4657d7e
Use __reduce_ex__ and __getnewargs_ex__
Feb 20, 2019
2fc3366
Remove some Refleaks
Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Implement BaseException.__getnewargs_ex__
  • Loading branch information
Rémi Lapeyre committed Feb 20, 2019
commit 6c906daa98a3ac9daa97c4902635fe3db6915226
56 changes: 14 additions & 42 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,54 +222,25 @@ BaseException_repr(PyBaseExceptionObject *self)
static PyObject *
BaseException_reduce(PyBaseExceptionObject *self, PyObject *Py_UNUSED(ignored))
{
PyObject *functools;
PyObject *partial;
PyObject *constructor;
PyObject *result;
PyObject **newargs;

_Py_IDENTIFIER(partial);
functools = PyImport_ImportModule("functools");
if (functools == NULL) {
return NULL;
}
partial = _PyObject_GetAttrId(functools, &PyId_partial);
Py_DECREF(functools);
if (partial == NULL) {
return NULL;
}

Py_ssize_t len = 1;
if (PyTuple_Check(self->args)) {
len += PyTuple_GET_SIZE(self->args);
}
newargs = PyMem_New(PyObject *, len);
if (newargs == NULL) {
PyErr_NoMemory();
return NULL;
if (self->args && self->dict) {
return PyTuple_Pack(3, Py_TYPE(self), self->args, self->dict);
}
newargs[0] = (PyObject *)Py_TYPE(self);

for (Py_ssize_t i=1; i < len; i++) {
newargs[i] = PyTuple_GetItem(self->args, i-1);
else {
return PyTuple_Pack(2, Py_TYPE(self), self->args);
}
constructor = _PyObject_FastCallDict(partial, newargs, len, self->kwargs);
PyMem_Free(newargs);
}

Py_DECREF(partial);
static PyObject *
BaseException_getnewargs_ex(PyBaseExceptionObject *self, PyObject *Py_UNUSED(ignored))
{
PyObject *args = PyObject_GetAttrString((PyObject *) self, "args");
PyObject *kwargs = PyObject_GetAttrString((PyObject *) self, "kwargs");

PyObject *args = PyTuple_New(0);
if (args == NULL) {
if (args == NULL || kwargs == NULL) {
return NULL;
}
if (self->args && self->dict){
result = PyTuple_Pack(3, constructor, args, self->dict);
} else {
result = PyTuple_Pack(2, constructor, args);
}
Py_DECREF(constructor);
Py_DECREF(args);
return result;

return Py_BuildValue("(OO)", args, kwargs);
}

/*
Expand Down Expand Up @@ -312,6 +283,7 @@ PyDoc_STRVAR(with_traceback_doc,

static PyMethodDef BaseException_methods[] = {
{"__reduce__", (PyCFunction)BaseException_reduce, METH_NOARGS },
{"__getnewargs_ex__", (PyCFunction)BaseException_getnewargs_ex, METH_NOARGS },
{"__setstate__", (PyCFunction)BaseException_setstate, METH_O },
{"with_traceback", (PyCFunction)BaseException_with_traceback, METH_O,
with_traceback_doc},
Expand Down