Fix pyo3 0.25 API incompatibilities

Author: clin1234

Cargo.lock

@@ -11,7 +11,7 @@ use {
         exceptions::{PyIndexError, PyTypeError, PyValueError},
         ffi::Py_buffer,
         prelude::*,
-        types::{PyBytes, PyTuple},
+        types::{PyBytes, PyTuple}, IntoPyObjectExt,
     },
 };
 
@@ -242,7 +242,7 @@ impl ZstdBufferWithSegments {
         }
 
         Ok(Self {
-            source: data.into_py(py),
+            source: data.into_py_any(py).unwrap(),
             buffer: data_buffer,
             segments,
         })
@@ -344,7 +344,7 @@ impl ZstdBufferWithSegmentsCollection {
 
             offset += segment.segments.len();
 
-            buffers.push(item.to_object(py));
+            buffers.push(item.into_py_any(py).unwrap());
             first_elements.push(offset);
         }
 

rust-ext/src/buffers.rs

@@ -10,7 +10,7 @@ use {
         stream::{make_in_buffer_source, InBufferSource},
         zstd_safe::CCtx,
     },
-    pyo3::{prelude::*, types::PyBytes},
+    pyo3::{prelude::*, types::PyBytes, IntoPyObjectExt},
     std::sync::Arc,
 };
 
@@ -225,7 +225,7 @@ impl ZstdCompressionChunkerIterator {
                 let chunk = PyBytes::new(py, &slf.dest_buffer);
                 slf.dest_buffer.clear();
 
-                return Ok(Some(chunk.into_py(py)));
+                return Ok(Some(chunk.into_py_any(py).unwrap()));
             }
 
             // Else continue to compress available input data.
@@ -278,6 +278,6 @@ impl ZstdCompressionChunkerIterator {
         let chunk = PyBytes::new(py, &slf.dest_buffer);
         slf.dest_buffer.clear();
 
-        Ok(Some(chunk.into_py(py)))
+        Ok(Some(chunk.into_py_any(py).unwrap()))
     }
 }

rust-ext/src/compression_chunker.rs

@@ -10,7 +10,7 @@ use {
         buffer::PyBuffer,
         exceptions::{PyNotImplementedError, PyOSError, PyValueError},
         prelude::*,
-        types::PyBytes,
+        types::PyBytes, IntoPyObjectExt,
     },
     std::sync::Arc,
 };
@@ -48,7 +48,7 @@ impl ZstdCompressionWriter {
 
         Ok(Self {
             cctx,
-            writer: writer.into_py(py),
+            writer: writer.into_py_any(py).unwrap(),
             write_return_read,
             closefd,
             entered: false,

rust-ext/src/compression_writer.rs

@@ -10,7 +10,7 @@ use {
         stream::{make_in_buffer_source, InBufferSource},
         zstd_safe::CCtx,
     },
-    pyo3::{prelude::*, types::PyBytes},
+    pyo3::{prelude::*, types::PyBytes, IntoPyObjectExt},
     std::sync::Arc,
 };
 
@@ -60,7 +60,7 @@ impl ZstdCompressorIterator {
                 // TODO avoid buffer copy
                 let chunk = PyBytes::new(py, &dest_buffer);
 
-                return Ok(Some(chunk.into_py(py)));
+                return Ok(Some(chunk.into_py_any(py).unwrap()));
             }
 
             // Else read another chunk in hopes of producing output data.
@@ -94,7 +94,7 @@ impl ZstdCompressorIterator {
             // TODO avoid buffer copy.
             let chunk = PyBytes::new(py, &dest_buffer);
 
-            return Ok(Some(chunk.into_py(py)));
+            return Ok(Some(chunk.into_py_any(py).unwrap()));
         }
 
         Ok(None)

rust-ext/src/compressor_iterator.rs

@@ -10,7 +10,7 @@ use {
         buffer::PyBuffer,
         exceptions::{PyOSError, PyValueError},
         prelude::*,
-        types::PyBytes,
+        types::PyBytes, IntoPyObjectExt,
     },
     std::sync::Arc,
 };
@@ -40,7 +40,7 @@ impl ZstdDecompressionWriter {
     ) -> PyResult<Self> {
         Ok(Self {
             dctx,
-            writer: writer.into_py(py),
+            writer: writer.into_py_any(py).unwrap(),
             write_size,
             write_return_read,
             closefd,

rust-ext/src/decompression_writer.rs

@@ -10,7 +10,7 @@ use {
         stream::{make_in_buffer_source, InBufferSource},
         zstd_safe::DCtx,
     },
-    pyo3::{exceptions::PyValueError, prelude::*, types::PyBytes},
+    pyo3::{exceptions::PyValueError, prelude::*, types::PyBytes, IntoPyObjectExt},
     std::{cmp::min, sync::Arc},
 };
 
@@ -60,7 +60,7 @@ impl ZstdDecompressorIterator {
             if !dest_buffer.is_empty() {
                 // TODO avoid buffer copy.
                 let chunk = PyBytes::new(py, &dest_buffer);
-                return Ok(Some(chunk.into_py(py)));
+                return Ok(Some(chunk.into_py_any(py).unwrap()));
             }
 
             // Repeat loop to collect more input data.
@@ -71,7 +71,7 @@ impl ZstdDecompressorIterator {
         if !dest_buffer.is_empty() {
             // TODO avoid buffer copy.
             let chunk = PyBytes::new(py, &dest_buffer);
-            Ok(Some(chunk.into_py(py)))
+            Ok(Some(chunk.into_py_any(py).unwrap()))
         } else {
             Ok(None)
         }

rust-ext/src/decompressor_iterator.rs

@@ -5,7 +5,7 @@
 // of the BSD license. See the LICENSE file for details.
 
 use {
-    pyo3::{buffer::PyBuffer, exceptions::PyValueError, prelude::*},
+    pyo3::{buffer::PyBuffer, exceptions::PyValueError, prelude::*, IntoPyObjectExt},
     zstd_sys::ZSTD_inBuffer,
 };
 
@@ -139,7 +139,7 @@ pub(crate) fn make_in_buffer_source(
 ) -> PyResult<Box<dyn InBufferSource + Send>> {
     if source.hasattr("read")? {
         Ok(Box::new(ReadSource {
-            source: source.into_py(py),
+            source: source.into_py_any(py).unwrap(),
             buffer: None,
             read_size,
             finished: false,
@@ -153,7 +153,7 @@ pub(crate) fn make_in_buffer_source(
         })?;
 
         Ok(Box::new(BufferSource {
-            source: source.into_py(py),
+            source: source.into_py_any(py).unwrap(),
             buffer,
             offset: 0,
         }))