ffi cleanup: methodobject to moduleobject #1425
Conversation
| pub unsafe fn PyCFunction_CheckExact(op: *mut PyObject) -> c_int { | ||
| (Py_TYPE(op) == &mut PyCFunction_Type) as c_int | ||
| } | ||
|
|
||
| #[inline] | ||
| pub unsafe fn PyCFunction_Check(op: *mut PyObject) -> c_int { | ||
| (Py_TYPE(op) == &mut PyCFunction_Type) as c_int |
There was a problem hiding this comment.
This definition PyCFunction_Check is the same as the new PyCFunction_CheckExact - does it need updating?
There was a problem hiding this comment.
Oops, thanks. Looks like this one was renamed in Python 3.9, with the new definition of PyCFunction_Check using PyObject_TypeCheck. Updated.
There was a problem hiding this comment.
Looks like 3.9 introduced the Py_IS_TYPE macro in object.h, which I'll add -- should help catch these changes when eyeballing
| unsafe { self.str_from_ptr(ffi::PyModule_GetFilename(self.as_ptr())) } | ||
| unsafe { | ||
| self.py() | ||
| .from_owned_ptr_or_err::<PyString>(ffi::PyModule_GetFilenameObject(self.as_ptr()))? |
| #[deprecated(note = "not present in Python headers; to be removed")] | ||
| pub const PyModuleDef_INIT: PyModuleDef = PyModuleDef { |
There was a problem hiding this comment.
This would be breaking, but I guess the only user is pyclass.rs and we can remove this.
There was a problem hiding this comment.
Agreed, as I think we're going to do a breaking release next anyway it's fine to just scrap this.
There was a problem hiding this comment.
@davidhewitt You'll do this in #1426 or should I add to this PR?
There was a problem hiding this comment.
I think probably simpler for you to do it in this PR so there's no risk of merge conflicts.
There was a problem hiding this comment.
Actually nvm, I see that other than that, this PR is ready to go. I'll merge this PR now and do it in #1426.
|
👍 Thanks again! |
Main changes are to deprecate some functions to reflect the C API. This one isn't too challenging either, but next is
object.h, which will require some major refactoring tocpython/.This PR reflects
PyModule_GetFilename(returning achar*) being deprecated in Python 3.2 in favour ofPyModule_GetFilenameObject(returning aPyObject). We do use the former, but for now I've just put an#[allow(deprecated)]on that line.