Skip to content

gh-74917: Raise TypeError in the JSON encoder if the default function returns the same type #113458

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
serhiy-storchaka wants to merge 8 commits into from
Closed

gh-74917: Raise TypeError in the JSON encoder if the default function returns the same type #113458

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03beb5a
bpo-30732: json.dumps() lacks information about RecursionError relate…
svelankar Jul 25, 2017
4165b10
bpo-30732: json.dumps() lacks information about RecursionError relate…
svelankar Jul 30, 2017
31673b2
bpo-30732: json.dumps() lacks information about RecursionError relate…
svelankar Aug 1, 2017
6040758
bpo-30732: json.dumps() lacks information about RecursionError relate…
svelankar Aug 1, 2017
7c7c35a
Merge branch 'main' into bpo-30732
serhiy-storchaka Dec 24, 2023
0d72b0d
Add a test and Python implementation.
serhiy-storchaka Dec 24, 2023
8fcc89a
Improve the C implementation.
serhiy-storchaka Dec 24, 2023
4366dd6
Update docs.
serhiy-storchaka Dec 24, 2023
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
Improve the C implementation.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Dec 24, 2023
commit 8fcc89aafdf718e1db1c4a253032f4ca17df50c9
11 changes: 5 additions & 6 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,15 +1426,14 @@ encoder_listencode_obj(PyEncoderObject *s, _PyUnicodeWriter *writer,
}
}
newobj = PyObject_CallOneArg(s->defaultfn, obj);
if (newobj != NULL && Py_TYPE(newobj) == Py_TYPE(obj)) {
PyErr_SetString(PyExc_TypeError, "Default serialization function "
"returning same type");
Py_DECREF(newobj);
if (newobj == NULL) {
Py_XDECREF(ident);
return -1;
}

if (newobj == NULL) {
if (Py_TYPE(newobj) == Py_TYPE(obj)) {
PyErr_SetString(PyExc_TypeError, "Default serialization function "
"returning same type");
Py_DECREF(newobj);
Py_XDECREF(ident);
return -1;
}
Expand Down