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

Skip to content

gh-146440: Add "array_hook" parameter to JSON decoders #146441

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

Merged
vstinner merged 21 commits into from
Mar 27, 2026
Merged

gh-146440: Add "array_hook" parameter to JSON decoders #146441

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ced66ad
array_hook for JSON decoder
jsbueno Mar 20, 2026
cdb6dcf
Update documentation for array_hook parameter
jsbueno Mar 24, 2026
c7b77ee
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 26, 2026
be6cb37
Fix typo in news blurb
jsbueno Mar 26, 2026
2820503
Fix doc formatting
jsbueno Mar 26, 2026
b079384
Doc typo
jsbueno Mar 26, 2026
7ff9a73
'What's New' entry
jsbueno Mar 26, 2026
47072c3
Remove redundant default parameters
jsbueno Mar 26, 2026
9cd60a5
Fix blurb content + formatting
jsbueno Mar 26, 2026
6e48297
Formatting and missing parameter to JSONDecoder
jsbueno Mar 26, 2026
0eed2fb
Reformat blurb
jsbueno Mar 26, 2026
ee285ae
Merge branch 'main' into feature-json-array-hook
jsbueno Mar 26, 2026
2942826
Update Doc/whatsnew/3.15.rst
jsbueno Mar 26, 2026
227b52d
Linting fixes
jsbueno Mar 27, 2026
58d8897
Capitalization typo
jsbueno Mar 27, 2026
2a9cdd5
PEP 7 + Py_IsNone macro in functions touched
jsbueno Mar 27, 2026
9dc1258
Revert "PEP 7 + Py_IsNone macro in functions touched"
jsbueno Mar 27, 2026
fc82117
Change version to 'next'
jsbueno Mar 27, 2026
c4d6b37
Nested list + frozendict testcase
jsbueno Mar 27, 2026
8ea13ff
Apply suggestions from code review
vstinner Mar 27, 2026
d1e2077
Apply suggestions from code review
vstinner Mar 27, 2026
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
PEP 7 + Py_IsNone macro in functions touched
  • Loading branch information
@jsbueno
jsbueno committed Mar 27, 2026
commit 2a9cdd52ad63e9e8052cba6af49aa9ac137f025e
31 changes: 20 additions & 11 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ _parse_array_unicode(PyScannerObject *s, PyObject *memo, PyObject *pystr, Py_ssi
goto bail;
}
*next_idx_ptr = idx + 1;
/* if array_hook is not None: rval = array_hook(rval) */
if (s->array_hook != Py_None) {
/* if array_hook is not None: return array_hook(rval) */
if (!Py_IsNone(s->array_hook)) {
val = PyObject_CallOneArg(s->array_hook, rval);
Py_DECREF(rval);
return val;
Expand Down Expand Up @@ -1247,8 +1247,9 @@ scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *strict;
static char *kwlist[] = {"context", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:make_scanner", kwlist, &ctx))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:make_scanner", kwlist, &ctx)) {
return NULL;
}

s = (PyScannerObject *)type->tp_alloc(type, 0);
if (s == NULL) {
Expand All @@ -1257,30 +1258,38 @@ scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds)

/* All of these will fail "gracefully" so we don't need to verify them */
strict = PyObject_GetAttrString(ctx, "strict");
if (strict == NULL)
if (strict == NULL) {
goto bail;
}
s->strict = PyObject_IsTrue(strict);
Py_DECREF(strict);
if (s->strict < 0)
if (s->strict < 0) {
goto bail;
}
s->object_hook = PyObject_GetAttrString(ctx, "object_hook");
if (s->object_hook == NULL)
if (s->object_hook == NULL) {
goto bail;
}
s->object_pairs_hook = PyObject_GetAttrString(ctx, "object_pairs_hook");
if (s->object_pairs_hook == NULL)
if (s->object_pairs_hook == NULL) {
goto bail;
}
s->array_hook = PyObject_GetAttrString(ctx, "array_hook");
if (s->array_hook == NULL)
if (s->array_hook == NULL) {
goto bail;
}
s->parse_float = PyObject_GetAttrString(ctx, "parse_float");
if (s->parse_float == NULL)
if (s->parse_float == NULL) {
goto bail;
}
s->parse_int = PyObject_GetAttrString(ctx, "parse_int");
if (s->parse_int == NULL)
if (s->parse_int == NULL) {
goto bail;
}
s->parse_constant = PyObject_GetAttrString(ctx, "parse_constant");
if (s->parse_constant == NULL)
if (s->parse_constant == NULL) {
goto bail;
}

return (PyObject *)s;

Expand Down