add `Bound` constructors for `PyMemoryView`
This commit is contained in:
parent
e704a760b7
commit
b14dbcf29f
|
@ -1,5 +1,7 @@
|
||||||
use crate::err::PyResult;
|
use crate::err::PyResult;
|
||||||
use crate::{ffi, AsPyPointer, PyAny};
|
use crate::ffi_ptr_ext::FfiPtrExt;
|
||||||
|
use crate::py_result_ext::PyResultExt;
|
||||||
|
use crate::{ffi, AsPyPointer, Bound, PyAny, PyNativeType};
|
||||||
|
|
||||||
/// Represents a Python `memoryview`.
|
/// Represents a Python `memoryview`.
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
|
@ -8,14 +10,30 @@ pub struct PyMemoryView(PyAny);
|
||||||
pyobject_native_type_core!(PyMemoryView, pyobject_native_static_type_object!(ffi::PyMemoryView_Type), #checkfunction=ffi::PyMemoryView_Check);
|
pyobject_native_type_core!(PyMemoryView, pyobject_native_static_type_object!(ffi::PyMemoryView_Type), #checkfunction=ffi::PyMemoryView_Check);
|
||||||
|
|
||||||
impl PyMemoryView {
|
impl PyMemoryView {
|
||||||
/// Creates a new Python `memoryview` object from another Python object that
|
/// Deprecated form of [`PyMemoryView::from_bound`]
|
||||||
/// implements the buffer protocol.
|
#[cfg_attr(
|
||||||
|
not(feature = "gil-refs"),
|
||||||
|
deprecated(
|
||||||
|
since = "0.21.0",
|
||||||
|
note = "`PyMemoryView::from` will be replaced by `PyMemoryView::from_bound` in a future PyO3 version"
|
||||||
|
)
|
||||||
|
)]
|
||||||
pub fn from(src: &PyAny) -> PyResult<&PyMemoryView> {
|
pub fn from(src: &PyAny) -> PyResult<&PyMemoryView> {
|
||||||
unsafe {
|
unsafe {
|
||||||
src.py()
|
src.py()
|
||||||
.from_owned_ptr_or_err(ffi::PyMemoryView_FromObject(src.as_ptr()))
|
.from_owned_ptr_or_err(ffi::PyMemoryView_FromObject(src.as_ptr()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Creates a new Python `memoryview` object from another Python object that
|
||||||
|
/// implements the buffer protocol.
|
||||||
|
pub fn from_bound<'py>(src: &Bound<'py, PyAny>) -> PyResult<Bound<'py, Self>> {
|
||||||
|
unsafe {
|
||||||
|
ffi::PyMemoryView_FromObject(src.as_ptr())
|
||||||
|
.assume_owned_or_err(src.py())
|
||||||
|
.downcast_into_unchecked()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'py> TryFrom<&'py PyAny> for &'py PyMemoryView {
|
impl<'py> TryFrom<&'py PyAny> for &'py PyMemoryView {
|
||||||
|
@ -24,6 +42,16 @@ impl<'py> TryFrom<&'py PyAny> for &'py PyMemoryView {
|
||||||
/// Creates a new Python `memoryview` object from another Python object that
|
/// Creates a new Python `memoryview` object from another Python object that
|
||||||
/// implements the buffer protocol.
|
/// implements the buffer protocol.
|
||||||
fn try_from(value: &'py PyAny) -> Result<Self, Self::Error> {
|
fn try_from(value: &'py PyAny) -> Result<Self, Self::Error> {
|
||||||
PyMemoryView::from(value)
|
PyMemoryView::from_bound(&value.as_borrowed()).map(Bound::into_gil_ref)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'py> TryFrom<&Bound<'py, PyAny>> for Bound<'py, PyMemoryView> {
|
||||||
|
type Error = crate::PyErr;
|
||||||
|
|
||||||
|
/// Creates a new Python `memoryview` object from another Python object that
|
||||||
|
/// implements the buffer protocol.
|
||||||
|
fn try_from(value: &Bound<'py, PyAny>) -> Result<Self, Self::Error> {
|
||||||
|
PyMemoryView::from_bound(value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue