Merge pull request #66 from alex/pyo3-bump

Upgrade to pyo3 0.26, fixing all warnings

Author: vorner

.github/workflows/test.yaml

@@ -62,7 +62,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.63"
+          toolchain: "1.74"
 
       - name: Install Python
         uses: actions/setup-python@v5
@@ -74,7 +74,7 @@ jobs:
 
       - name: Install the minimal versions of dependencies
         env:
-          # `-Z minimal-versions` is unstable, so we set 
+          # `-Z minimal-versions` is unstable, so we set
           # `RUSTC_BOOTSTRAP=1` to be able to use it on stable
           RUSTC_BOOTSTRAP: "1"
         run: cargo update -Z minimal-versions

Cargo.toml

@@ -10,18 +10,18 @@ keywords = ["pyo3", "python", "logging"]
 categories = ["development-tools::debugging"]
 edition = "2018"
 license = "Apache-2.0 OR MIT"
-rust-version = "1.63"
+rust-version = "1.74"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 arc-swap = "~1"
 # It's OK to ask for std on log, because pyo3 needs it too.
 log = { version = "~0.4.4", default-features = false, features = ["std"] }
-pyo3 = { version = ">=0.23, <0.26", default-features = false }
+pyo3 = { version = "0.26", default-features = false }
 
 [dev-dependencies]
-pyo3 = { version = ">=0.23, <0.26", default-features = false, features = ["auto-initialize", "macros"] }
+pyo3 = { version = "0.26", default-features = false, features = ["auto-initialize", "macros"] }
 
 # `pyo3-macros` is lying about the minimal version for its `syn` dependency.
 # Because we're testing with `-Zminimal-versions`, we need to explicitly set it here.

examples/hello_world/Cargo.toml

@@ -12,5 +12,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 log = "~0.4"
-pyo3 = { version = "~0.17", features = ["extension-module"] }
+pyo3 = { version = "~0.26", features = ["extension-module"] }
 pyo3-log = { path = "../.." }

src/lib.rs

@@ -57,13 +57,13 @@
 //! #[pymodule]
 //! mod my_module{
 //!     use super::*;
-//!    
+//!
 //!    #[pymodule_init]
 //!     fn init(_m: &Bound<'_, PyModule>) -> PyResult<()> {
 //!         pyo3_log::init();
 //!         Ok(())
 //!     }
-//!  
+//!
 //!     #[pyfunction]
 //!     fn log_something() {
 //!         info!("Something!");
@@ -108,7 +108,7 @@
 //! # use pyo3_log::{Caching, Logger};
 //! #
 //! # fn main() -> PyResult<()> {
-//! # Python::with_gil(|py| {
+//! # Python::attach(|py| {
 //! let handle = Logger::new(py, Caching::LoggersAndLevels)?
 //!     .filter(LevelFilter::Trace)
 //!     .filter_target("my_module::verbose_submodule".to_owned(), LevelFilter::Warn)
@@ -171,7 +171,7 @@
 //! fn dont_deadlock(py: Python<'_>) {
 //!     info!("This logs fine");
 //!
-//!     py.allow_threads(|| {
+//!     py.detach(|| {
 //!         let background_thread = thread::spawn(|| {
 //!             info!("This'll not deadlock");
 //!         });
@@ -242,7 +242,7 @@ pub enum Caching {
 #[derive(Debug)]
 struct CacheEntry {
     filter: LevelFilter,
-    logger: PyObject,
+    logger: Py<PyAny>,
 }
 
 impl CacheEntry {
@@ -430,7 +430,7 @@ impl Logger {
         py: Python<'_>,
         record: &Record,
         cache: &Option<Arc<CacheNode>>,
-    ) -> PyResult<Option<PyObject>> {
+    ) -> PyResult<Option<Py<PyAny>>> {
         let msg = format!("{}", record.args());
         let log_level = map_level(record.level());
         let target = record.target().replace("::", ".");
@@ -520,7 +520,7 @@ impl Logger {
 
 impl Default for Logger {
     fn default() -> Self {
-        Python::with_gil(|py| {
+        Python::attach(|py| {
             Self::new(py, Caching::LoggersAndLevels).expect("Failed to initialize python logging")
         })
     }
@@ -537,7 +537,7 @@ impl Log for Logger {
         let cache = self.lookup(record.target());
 
         if self.enabled_inner(record.metadata(), &cache) {
-            Python::with_gil(|py| {
+            Python::attach(|py| {
                 // If an exception were triggered before this attempt to log,
                 // store it to the side for now and restore it afterwards.
                 let maybe_existing_exception = PyErr::take(py);