Skip to content

Commit

Permalink
Re-vendor pyo3 at the v0.23.4 commit (#1421)
Browse files Browse the repository at this point in the history
`orjson` still uses non-published functionality in `pyo3`, so we have to
keep it vendored.

Update our vendored `pyo3` to v0.23.4, to pick up the soundness fixes in
v0.23.3.
  • Loading branch information
obi1kenobi authored Jan 15, 2025
1 parent c813c65 commit f51ae95
Show file tree
Hide file tree
Showing 187 changed files with 2,696 additions and 1,146 deletions.
10 changes: 5 additions & 5 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions vendor/pyo3-info.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cloned from commit a42e53e888227724928c7f370cad47153a13b329
cloned from commit f2a8460559d8f58269f306679fc58c9d101f70cf (tag: v0.23.4)

then apply diff:

diff --git a/pyo3-ffi/src/modsupport.rs b/pyo3-ffi/src/modsupport.rs
diff --git a/vendor/pyo3/pyo3-ffi/src/modsupport.rs b/vendor/pyo3/pyo3-ffi/src/modsupport.rs
index 4a18d30f..6da2795b 100644
--- a/pyo3-ffi/src/modsupport.rs
+++ b/pyo3-ffi/src/modsupport.rs
--- a/vendor/pyo3/pyo3-ffi/src/modsupport.rs
+++ b/vendor/pyo3/pyo3-ffi/src/modsupport.rs
@@ -36,6 +36,13 @@ extern "C" {
pub fn Py_BuildValue(arg1: *const c_char, ...) -> *mut PyObject;
// skipped Py_VaBuildValue
Expand All @@ -20,11 +20,11 @@ index 4a18d30f..6da2795b 100644
#[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyModule_AddObjectRef")]
pub fn PyModule_AddObjectRef(
diff --git a/pyo3-ffi/src/object.rs b/pyo3-ffi/src/object.rs
index fc3484be..d2fa1930 100644
--- a/pyo3-ffi/src/object.rs
+++ b/pyo3-ffi/src/object.rs
@@ -211,7 +211,7 @@ pub unsafe fn Py_SIZE(ob: *mut PyObject) -> Py_ssize_t {
diff --git a/vendor/pyo3/pyo3-ffi/src/object.rs b/vendor/pyo3/pyo3-ffi/src/object.rs
index 3f086ac1..51083a8e 100644
--- a/vendor/pyo3/pyo3-ffi/src/object.rs
+++ b/vendor/pyo3/pyo3-ffi/src/object.rs
@@ -214,7 +214,7 @@ pub unsafe fn Py_SIZE(ob: *mut PyObject) -> Py_ssize_t {

#[inline(always)]
#[cfg(all(Py_3_12, not(Py_GIL_DISABLED)))]
Expand Down
Loading

0 comments on commit f51ae95

Please sign in to comment.