Merge pull request #3793 from snuderl/PyNone-new-api

Implement new API for PyNone #3684

src/coroutine.rs

@@ -118,7 +118,7 @@ impl Coroutine {
         }
         // if waker has been waken during future polling, this is roughly equivalent to
         // `await asyncio.sleep(0)`, so just yield `None`.
-        Ok(py.None().into())
+        Ok(py.None().into_py(py))
     }
 }
 

src/marker.rs

@@ -699,7 +699,7 @@ impl<'py> Python<'py> {
     #[allow(non_snake_case)] // the Python keyword starts with uppercase
     #[inline]
     pub fn None(self) -> PyObject {
-        PyNone::get(self).into()
+        PyNone::get_bound(self).into_py(self)
     }
 
     /// Gets the Python builtin value `Ellipsis`, or `...`.

src/types/none.rs

@@ -1,4 +1,5 @@
-use crate::{ffi, IntoPy, PyAny, PyObject, PyTypeInfo, Python, ToPyObject};
+use crate::ffi_ptr_ext::FfiPtrExt;
+use crate::{ffi, Borrowed, IntoPy, PyAny, PyObject, PyTypeInfo, Python, ToPyObject};
 
 /// Represents the Python `None` object.
 #[repr(transparent)]
@@ -9,10 +10,24 @@ pyobject_native_type_extract!(PyNone);
 
 impl PyNone {
     /// Returns the `None` object.
+    /// Deprecated form of [`PyNone::get_bound`]
+    #[cfg_attr(
+        not(feature = "gil-refs"),
+        deprecated(
+            since = "0.21.0",
+            note = "`PyNone::get` will be replaced by `PyBool::get_bound` in a future PyO3 version"
+        )
+    )]
     #[inline]
     pub fn get(py: Python<'_>) -> &PyNone {
         unsafe { py.from_borrowed_ptr(ffi::Py_None()) }
     }
+
+    /// Returns the `None` object.
+    #[inline]
+    pub fn get_bound(py: Python<'_>) -> Borrowed<'_, '_, PyNone> {
+        unsafe { ffi::Py_None().assume_borrowed(py).downcast_unchecked() }
+    }
 }
 
 unsafe impl PyTypeInfo for PyNone {
@@ -32,48 +47,52 @@ unsafe impl PyTypeInfo for PyNone {
 
     #[inline]
     fn is_exact_type_of(object: &PyAny) -> bool {
-        object.is(Self::get(object.py()))
+        let none = Self::get_bound(object.py());
+        object.is(none.as_ref())
     }
 }
 
 /// `()` is converted to Python `None`.
 impl ToPyObject for () {
     fn to_object(&self, py: Python<'_>) -> PyObject {
-        PyNone::get(py).into()
+        PyNone::get_bound(py).into_py(py)
     }
 }
 
 impl IntoPy<PyObject> for () {
     #[inline]
     fn into_py(self, py: Python<'_>) -> PyObject {
-        PyNone::get(py).into()
+        PyNone::get_bound(py).into_py(py)
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use crate::types::any::PyAnyMethods;
     use crate::types::{PyDict, PyNone};
     use crate::{IntoPy, PyObject, PyTypeInfo, Python, ToPyObject};
-
     #[test]
     fn test_none_is_itself() {
         Python::with_gil(|py| {
-            assert!(PyNone::get(py).is_instance_of::<PyNone>());
+            assert!(PyNone::get_bound(py).is_instance_of::<PyNone>());
-            assert!(PyNone::get(py).is_exact_instance_of::<PyNone>());
+            assert!(PyNone::get_bound(py).is_exact_instance_of::<PyNone>());
         })
     }
 
     #[test]
     fn test_none_type_object_consistent() {
         Python::with_gil(|py| {
-            assert!(PyNone::get(py).get_type().is(PyNone::type_object(py)));
+            assert!(PyNone::get_bound(py).get_type().is(PyNone::type_object(py)));
         })
     }
 
     #[test]
     fn test_none_is_none() {
         Python::with_gil(|py| {
-            assert!(PyNone::get(py).downcast::<PyNone>().unwrap().is_none());
+            assert!(PyNone::get_bound(py)
+                .downcast::<PyNone>()
+                .unwrap()
+                .is_none());
         })
     }