rust: replace deprecated *bound functions

This accounts for most of the deprecation warnings after the
0.23 PyO3 upgrade.

Author: indygreg

rust-ext/src/buffers.rs

@@ -83,7 +83,7 @@ impl ZstdBufferSegment {
     }
 
     fn tobytes<'p>(&self, py: Python<'p>) -> PyResult<Bound<'p, PyBytes>> {
-        Ok(PyBytes::new_bound(py, self.as_slice()))
+        Ok(PyBytes::new(py, self.as_slice()))
     }
 }
 
@@ -179,7 +179,7 @@ impl ZstdBufferWithSegments {
 
         Ok(ZstdBufferSegment {
             _parent: self.source.clone_ref(py),
-            buffer: PyBuffer::get_bound(self.source.downcast_bound(py)?)?,
+            buffer: PyBuffer::get(self.source.downcast_bound(py)?)?,
             offset: segment.offset as _,
             len: segment.length as _,
         })
@@ -211,7 +211,7 @@ impl ZstdBufferWithSegments {
 
     #[new]
     pub fn new(py: Python, data: &Bound<'_, PyAny>, segments: PyBuffer<u8>) -> PyResult<Self> {
-        let data_buffer = PyBuffer::get_bound(&data.as_borrowed())?;
+        let data_buffer = PyBuffer::get(&data.as_borrowed())?;
 
         if segments.len_bytes() % std::mem::size_of::<BufferSegment>() != 0 {
             return Err(PyValueError::new_err(format!(
@@ -261,7 +261,7 @@ impl ZstdBufferWithSegments {
     }
 
     fn tobytes<'p>(&self, py: Python<'p>) -> PyResult<Bound<'p, PyBytes>> {
-        Ok(PyBytes::new_bound(py, self.as_slice()))
+        Ok(PyBytes::new(py, self.as_slice()))
     }
 }
 

rust-ext/src/compression_chunker.rs

@@ -119,7 +119,7 @@ impl ZstdCompressionChunker {
         }
 
         let source =
-            make_in_buffer_source(py, &PyBytes::new_bound(py, &[]), zstd_safe::CCtx::in_size())?;
+            make_in_buffer_source(py, &PyBytes::new(py, &[]), zstd_safe::CCtx::in_size())?;
 
         let it = Bound::new(
             py,
@@ -153,7 +153,7 @@ impl ZstdCompressionChunker {
         }
 
         let source =
-            make_in_buffer_source(py, &PyBytes::new_bound(py, &[]), zstd_safe::CCtx::in_size())?;
+            make_in_buffer_source(py, &PyBytes::new(py, &[]), zstd_safe::CCtx::in_size())?;
 
         let it = Bound::new(
             py,
@@ -222,7 +222,7 @@ impl ZstdCompressionChunkerIterator {
 
             // If we produced a full output chunk, emit it.
             if slf.dest_buffer.len() == slf.dest_buffer.capacity() {
-                let chunk = PyBytes::new_bound(py, &slf.dest_buffer);
+                let chunk = PyBytes::new(py, &slf.dest_buffer);
                 slf.dest_buffer.clear();
 
                 return Ok(Some(chunk.into_py(py)));
@@ -275,7 +275,7 @@ impl ZstdCompressionChunkerIterator {
             slf.finished = true;
         }
 
-        let chunk = PyBytes::new_bound(py, &slf.dest_buffer);
+        let chunk = PyBytes::new(py, &slf.dest_buffer);
         slf.dest_buffer.clear();
 
         Ok(Some(chunk.into_py(py)))

rust-ext/src/compression_dict.rs

@@ -120,7 +120,7 @@ impl ZstdCompressionDict {
     }
 
     fn as_bytes<'p>(&self, py: Python<'p>) -> PyResult<Bound<'p, PyBytes>> {
-        Ok(PyBytes::new_bound(py, &self.data))
+        Ok(PyBytes::new(py, &self.data))
     }
 
     fn dict_id(&self) -> u32 {

rust-ext/src/compression_parameters.rs

@@ -404,7 +404,7 @@ impl ZstdCompressionParameters {
         let kwargs = if let Some(v) = kwargs {
             v.copy()?
         } else {
-            PyDict::new_bound(py)
+            PyDict::new(py)
         };
 
         let level = args.get_item(0)?.extract::<i32>()?;
@@ -448,7 +448,7 @@ impl ZstdCompressionParameters {
             kwargs.set_item("strategy", compression_params.strategy as u32)?;
         }
 
-        Self::new(py, &PyTuple::empty_bound(py), Some(&kwargs))
+        Self::new(py, &PyTuple::empty(py), Some(&kwargs))
     }
 
     #[new]
@@ -468,7 +468,7 @@ impl ZstdCompressionParameters {
         let kwargs = if let Some(v) = kwargs {
             v.copy()?
         } else {
-            PyDict::new_bound(py)
+            PyDict::new(py)
         };
 
         instance.set_parameters(&kwargs)?;

rust-ext/src/compression_reader.rs

@@ -117,18 +117,18 @@ impl ZstdCompressionReader {
 
     fn __iter__(slf: PyRef<Self>) -> PyResult<()> {
         let py = slf.py();
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn __next__(slf: PyRef<Self>) -> PyResult<Option<()>> {
         let py = slf.py();
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn __enter__<'p>(mut slf: PyRefMut<'p, Self>, _py: Python<'p>) -> PyResult<PyRefMut<'p, Self>> {
@@ -170,19 +170,19 @@ impl ZstdCompressionReader {
     }
 
     fn readline(&self, py: Python) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     #[pyo3(signature = (hint=None))]
     #[allow(unused_variables)]
     fn readlines(&self, py: Python, hint: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn write(&self, _data: &Bound<'_, PyAny>) -> PyResult<()> {
@@ -227,7 +227,7 @@ impl ZstdCompressionReader {
     }
 
     fn readall<'p>(&mut self, py: Python<'p>) -> PyResult<Bound<'p, PyAny>> {
-        let chunks = PyList::empty_bound(py);
+        let chunks = PyList::empty(py);
 
         loop {
             let chunk = self.read(py, 1048576)?;
@@ -239,7 +239,7 @@ impl ZstdCompressionReader {
             chunks.append(chunk)?;
         }
 
-        let empty = PyBytes::new_bound(py, &[]);
+        let empty = PyBytes::new(py, &[]);
 
         empty.call_method1("join", (chunks,))
     }
@@ -261,7 +261,7 @@ impl ZstdCompressionReader {
         }
 
         if self.finished_output || size == 0 {
-            return Ok(PyBytes::new_bound(py, &[]).into_any());
+            return Ok(PyBytes::new(py, &[]).into_any());
         }
 
         let mut dest_buffer: Vec<u8> = Vec::with_capacity(size as _);
@@ -270,7 +270,7 @@ impl ZstdCompressionReader {
             // If the output buffer is full, return its content.
             if self.compress_into_vec(py, &mut dest_buffer)? {
                 // TODO avoid buffer copy.
-                return Ok(PyBytes::new_bound(py, &dest_buffer).into_any());
+                return Ok(PyBytes::new(py, &dest_buffer).into_any());
             }
             // Else continue to read new input into the compressor.
         }
@@ -302,7 +302,7 @@ impl ZstdCompressionReader {
         }
 
         // TODO avoid buffer copy.
-        Ok(PyBytes::new_bound(py, &dest_buffer).into_any())
+        Ok(PyBytes::new(py, &dest_buffer).into_any())
     }
 
     #[pyo3(signature = (size=-1))]
@@ -318,7 +318,7 @@ impl ZstdCompressionReader {
         }
 
         if self.finished_output || size == 0 {
-            return Ok(PyBytes::new_bound(py, &[]).into_any());
+            return Ok(PyBytes::new(py, &[]).into_any());
         }
 
         // -1 returns arbitrary number of bytes.
@@ -350,7 +350,7 @@ impl ZstdCompressionReader {
             || (!dest_buffer.is_empty() && !self.source.finished())
         {
             // TODO avoid buffer copy.
-            return Ok(PyBytes::new_bound(py, &dest_buffer).into_any());
+            return Ok(PyBytes::new(py, &dest_buffer).into_any());
         }
 
         // Input must be exhausted. Finish the compression stream.
@@ -380,7 +380,7 @@ impl ZstdCompressionReader {
         }
 
         // TODO avoid buffer copy
-        Ok(PyBytes::new_bound(py, &dest_buffer).into_any())
+        Ok(PyBytes::new(py, &dest_buffer).into_any())
     }
 
     fn readinto(&mut self, py: Python, buffer: PyBuffer<u8>) -> PyResult<usize> {

rust-ext/src/compression_writer.rs

@@ -66,18 +66,18 @@ impl ZstdCompressionWriter {
 
     fn __iter__(slf: PyRef<Self>) -> PyResult<()> {
         let py = slf.py();
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn __next__(slf: PyRef<Self>) -> PyResult<Option<()>> {
         let py = slf.py();
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn __enter__<'p>(mut slf: PyRefMut<'p, Self>, _py: Python<'p>) -> PyResult<PyRefMut<'p, Self>> {
@@ -158,28 +158,28 @@ impl ZstdCompressionWriter {
     #[pyo3(signature = (size=None))]
     #[allow(unused_variables)]
     fn readline(&self, py: Python, size: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     #[pyo3(signature = (hint=None))]
     #[allow(unused_variables)]
     fn readlines(&self, py: Python, hint: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     #[pyo3(signature = (pos, whence=None))]
     #[allow(unused_variables)]
     fn seek(&self, py: Python, pos: isize, whence: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn seekable(&self) -> bool {
@@ -189,10 +189,10 @@ impl ZstdCompressionWriter {
     #[pyo3(signature = (size=None))]
     #[allow(unused_variables)]
     fn truncate(&self, py: Python, size: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn writable(&self) -> bool {
@@ -207,25 +207,25 @@ impl ZstdCompressionWriter {
     #[pyo3(signature = (size=None))]
     #[allow(unused_variables)]
     fn read(&self, py: Python, size: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn readall(&self, py: Python) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     #[allow(unused_variables)]
     fn readinto(&self, py: Python, b: &Bound<'_, PyAny>) -> PyResult<()> {
-        let io = py.import_bound("io")?;
+        let io = py.import("io")?;
         let exc = io.getattr("UnsupportedOperation")?;
 
-        Err(PyErr::from_value_bound(exc))
+        Err(PyErr::from_value(exc))
     }
 
     fn write(&mut self, py: Python, buffer: PyBuffer<u8>) -> PyResult<usize> {
@@ -252,7 +252,7 @@ impl ZstdCompressionWriter {
 
             if !self.dest_buffer.is_empty() {
                 // TODO avoid buffer copy.
-                let chunk = PyBytes::new_bound(py, &self.dest_buffer);
+                let chunk = PyBytes::new(py, &self.dest_buffer);
                 self.writer.call_method1(py, "write", (chunk,))?;
 
                 total_write += self.dest_buffer.len();
@@ -299,7 +299,7 @@ impl ZstdCompressionWriter {
 
             if !self.dest_buffer.is_empty() {
                 // TODO avoid buffer copy.
-                let chunk = PyBytes::new_bound(py, &self.dest_buffer);
+                let chunk = PyBytes::new(py, &self.dest_buffer);
                 self.writer.call_method1(py, "write", (chunk,))?;
 
                 total_write += self.dest_buffer.len();

rust-ext/src/compressionobj.rs

@@ -65,7 +65,7 @@ impl ZstdCompressionObj {
             source = result.1;
         }
 
-        Ok(PyBytes::new_bound(py, &compressed))
+        Ok(PyBytes::new(py, &compressed))
     }
 
     #[pyo3(signature = (flush_mode=None))]
@@ -111,7 +111,7 @@ impl ZstdCompressionObj {
             result.extend(&chunk);
 
             if !call_again {
-                return Ok(PyBytes::new_bound(py, &result));
+                return Ok(PyBytes::new(py, &result));
             }
         }
     }

rust-ext/src/compressor.rs

@@ -173,7 +173,7 @@ impl ZstdCompressor {
             .allow_threads(|| cctx.compress(source))
             .or_else(|msg| Err(ZstdError::new_err(format!("cannot compress: {}", msg))))?;
 
-        Ok(PyBytes::new_bound(py, &data))
+        Ok(PyBytes::new(py, &data))
     }
 
     #[pyo3(signature = (size=None, chunk_size=None))]
@@ -298,7 +298,7 @@ impl ZstdCompressor {
 
                 if !chunk.is_empty() {
                     // TODO avoid buffer copy.
-                    let data = PyBytes::new_bound(py, chunk);
+                    let data = PyBytes::new(py, chunk);
                     ofh.call_method("write", (data,), None)?;
                     total_write += chunk.len();
                 }
@@ -321,7 +321,7 @@ impl ZstdCompressor {
 
             if !chunk.is_empty() {
                 // TODO avoid buffer copy.
-                let data = PyBytes::new_bound(py, &chunk);
+                let data = PyBytes::new(py, &chunk);
                 ofh.call_method("write", (data,), None)?;
                 total_write += chunk.len();
             }