Skip to content
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.

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

bpo-1635741: port pyexpat to multi-phase init (PEP 489) #22222

Merged
merged 3 commits into from
Jan 4, 2021

Conversation

koubaa
Copy link
Contributor

@koubaa koubaa commented Sep 13, 2020

@koubaa
Copy link
Contributor Author

koubaa commented Sep 13, 2020

@vstinner @corona10 @shihai1991 please review.

There's PyCapsule_New usage but the capsule methods did not depend on any globals so it isn't a concern in this case.

@shihai1991
Copy link
Member

shihai1991 commented Sep 13, 2020

compile warning in here:

##[warning]/home/runner/work/cpython/cpython/Modules/pyexpat.c:1185:1: warning: ‘xmlparse_dealloc’ defined but not used [-Wunused-function]
 xmlparse_dealloc(xmlparseobject *self)
 ^~~~~~~~~~~~~~~~

@koubaa
Copy link
Contributor Author

koubaa commented Sep 13, 2020

compile warning in here:

##[warning]/home/runner/work/cpython/cpython/Modules/pyexpat.c:1185:1: warning: ‘xmlparse_dealloc’ defined but not used [-Wunused-function]
 xmlparse_dealloc(xmlparseobject *self)
 ^~~~~~~~~~~~~~~~

Oops, I forgot to add this to the type slots. Should be fixed now

}

Py_INCREF(state->error);
if (PyModule_AddObject(mod, "error", state->error ) < 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DECREF is needed on error, no? Same comment for the following PyModule_AddObject calls.

}
errors_module = PyDict_GetItemWithError(d, errmod_name);

PyObject *errors_module = PyDict_GetItemWithError(d, errmod_name);
if (errors_module == NULL && !PyErr_Occurred()) {
errors_module = PyModule_New(MODULE_NAME ".errors");
if (errors_module != NULL) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to "goto error" if PyModule_New() fails.

@vstinner
Copy link
Member

Maybe it would be simpler to extract changes which add error handling to the exec function, and write a second PR to convert the module to multi-phase init. Since the existing code basically has no code to handle errors :-(

You can rename pyexpat_exec() to PyInit_pyexpat() and just add Py_DECREF(m) in "goto error".

@vstinner
Copy link
Member

vstinner commented Oct 2, 2020

I would prefer to get PR #22489 merged before this one, to ease review ;-)

@koubaa koubaa force-pushed the bpo-1635741-pyexpat branch from bf06df6 to c483618 Compare November 7, 2020 02:07
@koubaa
Copy link
Contributor Author

koubaa commented Nov 7, 2020

@vstinner rebased and I think ready to go. Please review

@koubaa koubaa force-pushed the bpo-1635741-pyexpat branch from c483618 to 5262887 Compare November 15, 2020 17:32
@erlend-aasland
Copy link
Contributor

Shouldn't handler_info also be a part of the module state?

@vstinner vstinner merged commit c8a87ad into python:master Jan 4, 2021
@vstinner
Copy link
Member

vstinner commented Jan 4, 2021

@shihai1991 made expat_CAPI per module instance in commit 7c83eaa.

I merged the PR, thanks @koubaa!

Shouldn't handler_info also be a part of the module state?

Hum. It doesn't contain anything dynamically allocated. It's a static array of static data. I don't think that we have to make it per instance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants