10000 bpo-1635741: Port _json extension module to multiphase initialization(PEP 489) by shihai1991 · Pull Request #17835 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-1635741: Port _json extension module to multiphase initialization(PEP 489) #17835

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
merged 7 commits into from
Jan 15, 2020
Merged

bpo-1635741: Port _json extension module to multiphase initialization(PEP 489) #17835

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d234888
port _json extension module to multiphase initialization(PEP 489)
shihai1991 Jan 5, 2020
658d1a7
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 5, 2020
768b489
Fix refcount bug
Jan 9, 2020
d2cbd2e
Merge branch 'bpo_1635741' of https://github.com/shihai1991/cpython i…
Jan 9, 2020
96d5f35
Update Misc/NEWS.d/next/Core and Builtins/2020-01-05-13-40-08.bpo-163…
shihai1991 Jan 9, 2020
078584c
Merge branch 'bpo_1635741' of https://github.com/shihai1991/cpython i…
shihai1991 Jan 9, 2020
d0ca663
Merge branch 'bpo_1635741' of https://github.com/shihai1991/cpython i…
shihai1991 Jan 10, 2020
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
Fix refcount bug
  • Loading branch information
shi hai committed Jan 9, 2020
commit 768b4898f04ef21d4db8943c82de4cc558e4489e
17 changes: 8 additions & 9 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,24 +1866,23 @@ PyDoc_STRVAR(module_doc,
static int
_json_exec(PyObject *module)
{
if (PyType_Ready(&PyScannerType) < 0)
goto fail;
if (PyType_Ready(&PyEncoderType) < 0)
goto fail;
if (PyType_Ready(&PyScannerType) < 0) {
return -1;
}
if (PyType_Ready(&PyEncoderType) < 0) {
return -1;
}
Py_INCREF((PyObject*)&PyScannerType);
if (PyModule_AddObject(module, "make_scanner", (PyObject*)&PyScannerType) < 0) {
Py_DECREF((PyObject*)&PyScannerType);
goto fail;
return -1;
}
Py_INCREF((PyObject*)&PyEncoderType);
if (PyModule_AddObject(module, "make_encoder", (PyObject*)&PyEncoderType) < 0) {
Py_DECREF((PyObject*)&PyEncoderType);
goto fail;
return -1;
}
return 0;
fail:
Py_DECREF(module);
return -1;
}

static PyModuleDef_Slot _json_slots[] = {
Expand Down
0