Skip to content

bpo-37587: Make json.loads faster for long strings #14752

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
ncoghlan merged 4 commits into from
Jul 30, 2019
Merged

bpo-37587: Make json.loads faster for long strings #14752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e78b873
bpo-37587: Make json.loads faster for long strings
mpaolini Jul 13, 2019
fa52a83
Mimimize the conditionals and the numer of ops inside the
mpaolini Jul 13, 2019
70feba6
Cleanup indentation
mpaolini Jul 13, 2019
f4ba2f0
Revert some changes not relevant for performance
mpaolini Jul 30, 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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-07-13-16-02-48.bpo-37587.fd-1aF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make json.loads faster for long strings. (Patch by Marco Paolini)
2 changes: 1 addition & 1 deletion Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict, Py_ssize_t *next
if (c == '"' || c == '\\') {
break;
}
else if (strict && c <= 0x1f) {
else if (c <= 0x1f && strict) {
raise_errmsg("Invalid control character at", pystr, next);
goto bail;
}
Expand Down