Define missing import APIs #1475
Conversation
indygreg
force-pushed
the
more-import-ffis
branch
from
a8e13ef to
9821882
Compare
davidhewitt
left a comment
davidhewitt
left a comment
There was a problem hiding this comment.
Thanks for adding these. Can they please be located in src/ffi/cpython/import.rs?
We try to match the cpython header structure as much as possible to make it easier to diff against upstream changes.
If you're willing to put the definitions as the same order as they currently are in the cpython header, that'd also be much appreciated.
src/ffi/import.rs
Outdated
| } | ||
|
|
||
| #[cfg(not(Py_LIMITED_API))] | ||
| extern "C" { |
There was a problem hiding this comment.
This extern block contains pub static mut so it's going to need #[cfg_attr(windows, link(name = "pythonXY"))]
|
Also can confirm that none of these APIs appear to exist for PyPy. |
indygreg
force-pushed
the
more-import-ffis
branch
from
9821882 to
ac6335a
Compare
src/ffi/cpython/import.rs
Outdated
| #[allow(unused)] | ||
| pub fn PyImport_ExtendInittab(newtab: *mut _inittab) -> c_int; |
There was a problem hiding this comment.
For some reason I'm getting a compiler warning about PyImport_ExtendInittab() being unused, so I suppressed this. Unsure why. Maybe the presence of the pub static mut above triggers it?
There was a problem hiding this comment.
Yeah, that was it. I moved this to its own block 🤷♂️
indygreg
force-pushed
the
more-import-ffis
branch
from
ac6335a to
40c0098
Compare
davidhewitt
left a comment
davidhewitt
left a comment
There was a problem hiding this comment.
Thanks! Just a final couple of tweaks needed before merging.
Strange, I can't reproduce the unused code warning if I remove those two attributes from the static mut variables...
nw0
left a comment
nw0
left a comment
There was a problem hiding this comment.
I think the current comments cover everything in import.h from CPython master.
|
@indygreg thanks for pushing this PR along to this point; I'm going to take it over and push a commit shortly to finish it off as part of some tidy-ups I'm doing for the 0.14 release. |
Co-authored-by: Nicholas Sim <[email protected]>
davidhewitt
force-pushed
the
more-import-ffis
branch
from
09e5aac to
754c27f
Compare
4 participants
I need some of these APIs for the pyembed crate (used as part of
PyOxidizer). I figured I might as well define them all.
All these APIs are limited.
I don't have a PyPy install with a shared library to test. We may need to disable these when targeting PyPy.