ffi cleanup: abstract.h #1436
Merged
ffi cleanup: abstract.h #1436
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidhewitt
approved these changes
Feb 20, 2021
|
I'm going to rebase this, force-push and merge shortly. Thanks again. |
Some functions available in earlier versions were moved to this directory, but are still valid.
|
Hmm, after rebasing we still have issues: the "macro" forms of |
Ouch. I've double-checked and PyIter_Check in 3.7 tries to use the contents of the opaque PyTypeObject, even under the limited API. I wonder why nobody noticed? I think the best thing to do here is to remove the functions again :( will do this by the weekend. |
While these are defined as macros in the Python C API, they rely on access to the PyTypeObject structure, which is not part of the limited API for those versions.
davidhewitt
approved these changes
Feb 28, 2021
Comment on lines
+92
to
+96
| // Defined as this macro in Python 3.6, 3.7 limited API, but relies on | ||
| // non-limited PyTypeObject. Don't expose this since it cannot be used. | ||
| #[cfg(not(any(Py_LIMITED_API, PyPy)))] | ||
| #[inline] | ||
| pub unsafe fn PyIter_Check(o: *mut PyObject) -> c_int { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes PyIter_Check available to Python earlier than 3.8 under the limited API.
This was due to some interaction between the
cfg(not(Py_LIMITED_API)onffi::cpython, and the cfg on PyIter_Check within theffi::cpythonmodule.However, it's always been in the limited API: as a macro before 3.8, and as a function since 3.8. Under the non-limited API it's always a macro.
Consequently we can implement PyTryFrom for PyIterator for all versions. I've (speculatively) commented out the cfg preventing that.
Similar changes for PyIndex_Check.