add support for PyFrozenDict

Author: MatthieuDartiailh

Cargo.toml

@@ -328,6 +328,10 @@ required-features = ["macros"]
 name = "test_exceptions"
 required-features = ["macros"]
 
+[[test]]
+name = "test_frozendict"
+required-features = ["macros"]
+
 [[test]]
 name = "test_field_cfg"
 required-features = ["macros"]

pyo3-ffi/src/cpython/dictobject.rs

@@ -44,11 +44,18 @@ pub struct PyDictObject {
     _tmpkeys: *mut PyObject,
 }
 
+#[cfg(Py_3_15)]
+#[cfg(not(GraalPy))]
+opaque_struct!(pub PyFrozenDictObject);
+
 extern_libpython! {
     #[cfg(Py_3_15)]
-    pub fn PyFrozenDict_New(iterable: *mut PyObject) -> *mut PyObject;
+    #[cfg_attr(not(RustPython), link_name = "PyFrozenDict_Type")]
+    pub static mut PyFrozenDict_Type: crate::object::PyTypeObject;
 }
 
+// PyFrozenDict_New declared in dictobject.rs (public FFI layer)
+
 // skipped private _PyDict_GetItem_KnownHash
 // skipped private _PyDict_GetItemStringWithError
 

pyo3-ffi/src/dictobject.rs

@@ -20,6 +20,41 @@ pub unsafe fn PyDict_CheckExact(op: *mut PyObject) -> c_int {
     Py_IS_TYPE(op, &raw mut PyDict_Type)
 }
 
+#[cfg(Py_3_15)]
+#[cfg(not(RustPython))]
+extern_libpython! {
+    pub static mut PyFrozenDict_Type: PyTypeObject;
+}
+
+#[inline]
+#[cfg(Py_3_15)]
+#[cfg(not(RustPython))]
+pub unsafe fn PyFrozenDict_CheckExact(op: *mut PyObject) -> c_int {
+    (Py_TYPE(op) == &raw mut PyFrozenDict_Type) as c_int
+}
+
+#[inline]
+#[cfg(Py_3_15)]
+#[cfg(not(RustPython))]
+pub unsafe fn PyFrozenDict_Check(op: *mut PyObject) -> c_int {
+    (Py_TYPE(op) == &raw mut PyFrozenDict_Type
+        || PyType_IsSubtype(Py_TYPE(op), &raw mut PyFrozenDict_Type) != 0) as c_int
+}
+
+#[inline]
+#[cfg(Py_3_15)]
+#[cfg(not(RustPython))]
+pub unsafe fn PyAnyDict_Check(op: *mut PyObject) -> c_int {
+    PyDict_Check(op) != 0 || PyFrozenDict_Check(op) != 0
+}
+
+#[inline]
+#[cfg(Py_3_15)]
+#[cfg(not(RustPython))]
+pub unsafe fn PyAnyDict_CheckExact(op: *mut PyObject) -> c_int {
+    (Py_TYPE(op) == &raw mut PyDict_Type || Py_TYPE(op) == &raw mut PyFrozenDict_Type) as c_int
+}
+
 extern_libpython! {
     #[cfg(RustPython)]
     pub fn PyDict_Check(op: *mut PyObject) -> c_int;
@@ -28,6 +63,8 @@ extern_libpython! {
 
     #[cfg_attr(PyPy, link_name = "PyPyDict_New")]
     pub fn PyDict_New() -> *mut PyObject;
+    #[cfg(Py_3_15)]
+    pub fn PyFrozenDict_New(iterable: *mut PyObject) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyDict_GetItem")]
     pub fn PyDict_GetItem(mp: *mut PyObject, key: *mut PyObject) -> *mut PyObject;
     #[cfg_attr(PyPy, link_name = "PyPyDict_GetItemWithError")]

src/prelude.rs

@@ -33,6 +33,8 @@ pub use crate::types::capsule::PyCapsuleMethods;
 pub use crate::types::complex::PyComplexMethods;
 pub use crate::types::dict::PyDictMethods;
 pub use crate::types::float::PyFloatMethods;
+#[cfg(Py_3_15)]
+pub use crate::types::frozendict::PyFrozenDictMethods;
 pub use crate::types::frozenset::PyFrozenSetMethods;
 pub use crate::types::list::PyListMethods;
 pub use crate::types::mapping::PyMappingMethods;