update pyo3

Author: mejrs

Cargo.lock

@@ -52,7 +52,7 @@ itertools = "0.10.3"
 memoffset = "0.6.5"
 ndarray = { version = "0.15.4", features = ["serde"] }
 path_macro = "1.0.0"
-pyo3 = { version = "0.18", features = ["extension-module"], optional = true }
+pyo3 = { version = "0.29", features = ["extension-module"], optional = true }
 rayon = "1.5.3"
 regex = "1.5.5"
 serde = { version = "1.0.136", features = ["derive"] }

Cargo.toml

@@ -9,4 +9,4 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 rs3cache = { path = "..", version = "0.1.0", features=["osrs", "pyo3"] }
-pyo3 = { version = "0.18", features = ["extension-module"]}
+pyo3 = { version = "0.29", features = ["extension-module"]}

osrs_py/Cargo.toml

@@ -1,7 +1,7 @@
 use pyo3::prelude::*;
 
 #[pymodule]
-fn osrs(py: Python, m: &PyModule) -> PyResult<()> {
+fn osrs(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     rs3cache::ffi::python::initializer(py, m)?;
     Ok(())
 }

osrs_py/osrs/osrs.pdb

@@ -9,4 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rs3cache = { path = "..", version = "0.1.0", features=["rs3", "pyo3"] }
-pyo3 = { version = "0.18", features = ["extension-module"]}
+pyo3 = { version = "0.29", features = ["extension-module"]}

osrs_py/src/lib.rs

@@ -1,7 +1,7 @@
 use pyo3::prelude::*;
 
 #[pymodule]
-fn rs3(py: Python, m: &PyModule) -> PyResult<()> {
+fn rs3(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     rs3cache::ffi::python::initializer(py, m)?;
     Ok(())
 }

rs3_py/Cargo.toml

@@ -16,7 +16,7 @@ itertools = "0.10.3"
 libflate = "1.1.2"
 memchr = "2.4.1"
 path_macro = "1.0.0"
-pyo3 = { version = "0.18", optional = true }
+pyo3 = { version = "0.29", optional = true }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
 serde_with = "1.12.0"

rs3_py/rs3/rs3.pdb

@@ -12,7 +12,7 @@ use std::collections::BTreeMap;
 
 use bytes::{Buf, Bytes};
 #[cfg(feature = "pyo3")]
-use pyo3::{exceptions::PyKeyError, prelude::*, types::PyBytes};
+use pyo3::{exceptions::PyKeyError, prelude::*, types::PyBytes, Bound};
 #[cfg(feature = "dat")]
 use {
     crate::buf::BufExtra,
@@ -22,7 +22,7 @@ use {
 
 use crate::meta::Metadata;
 /// A collection of files.
-#[cfg_attr(feature = "pyo3", pyclass(frozen))]
+#[cfg_attr(feature = "pyo3", pyclass(frozen, from_py_object))]
 #[derive(Clone, Default)]
 pub struct Archive {
     pub(crate) index_id: u32,
@@ -174,9 +174,9 @@ impl Archive {
                 compressed.extend(buffer.split_to(header.compressed_len as usize));
 
                 use pyo3::prelude::*;
-                pyo3::prepare_freethreaded_python();
+                Python::initialize();
 
-                let res = Python::with_gil(|py| {
+                let res = Python::attach(|py| {
                     let zlib = PyModule::import(py, "bz2")?;
                     let decompress = zlib.getattr("decompress")?;
                     let bytes = PyBytes::new(py, &compressed);
@@ -222,7 +222,7 @@ impl Archive {
 #[pymethods]
 impl Archive {
     #[pyo3(name = "file")]
-    fn py_file<'p>(&self, py: Python<'p>, file_id: u32) -> PyResult<&'p PyBytes> {
+    fn py_file<'p>(&self, py: Python<'p>, file_id: u32) -> PyResult<Bound<'p, PyBytes>> {
         if let Some(file) = self.files.get(&file_id) {
             Ok(PyBytes::new(py, file))
         } else {
@@ -231,7 +231,7 @@ impl Archive {
     }
 
     #[pyo3(name = "files")]
-    fn py_files<'p>(&self, py: Python<'p>) -> PyResult<BTreeMap<u32, &'p PyBytes>> {
+    fn py_files<'p>(&self, py: Python<'p>) -> PyResult<BTreeMap<u32, Bound<'p, PyBytes>>> {
         Ok(self.files.iter().map(|(&id, file)| (id, PyBytes::new(py, file))).collect())
     }