From a128e0b85ebe3e82480aa4e3c1c55769c8f76632 Mon Sep 17 00:00:00 2001
From: Thomas Pellissier-Tanon <thomas.pellissier-tanon@helsing.ai>
Date: Fri, 22 Aug 2025 11:50:40 +0200
Subject: [PATCH 1/7] fill PyTypeInfo::NAME with a Pythonic value

---
 newsfragments/5352.changed.md  |   1 +
 src/conversions/jiff.rs        |  14 +--
 src/exceptions.rs              | 193 +++++++++++++++++++++++++++------
 src/types/any.rs               |   3 +-
 src/types/boolobject.rs        |   2 +-
 src/types/bytearray.rs         |   2 +-
 src/types/bytes.rs             |   2 +-
 src/types/capsule.rs           |   2 +-
 src/types/code.rs              |   3 +-
 src/types/complex.rs           |   1 +
 src/types/datetime.rs          |  15 ++-
 src/types/dict.rs              |   4 +
 src/types/float.rs             |   1 +
 src/types/frame.rs             |   1 +
 src/types/frozenset.rs         |   2 +
 src/types/function.rs          |   4 +-
 src/types/genericalias.rs      |   3 +-
 src/types/list.rs              |   2 +-
 src/types/mappingproxy.rs      |   1 +
 src/types/memoryview.rs        |   2 +-
 src/types/mod.rs               |  26 ++---
 src/types/module.rs            |   2 +-
 src/types/num.rs               |   2 +-
 src/types/pysuper.rs           |   3 +-
 src/types/range.rs             |   2 +-
 src/types/set.rs               |   2 +
 src/types/slice.rs             |   1 +
 src/types/string.rs            |   2 +-
 src/types/traceback.rs         |   1 +
 src/types/tuple.rs             |   2 +-
 src/types/typeobject.rs        |   2 +-
 src/types/weakref/reference.rs |   1 +
 32 files changed, 230 insertions(+), 74 deletions(-)
 create mode 100644 newsfragments/5352.changed.md

diff --git a/newsfragments/5352.changed.md b/newsfragments/5352.changed.md
new file mode 100644
index 00000000000..d69732d3df2
--- /dev/null
+++ b/newsfragments/5352.changed.md
@@ -0,0 +1 @@
+fill `PyTypeInfo::NAME` with Pythonic values (e.g. BasedException) instead of C ones (e.g. PyBasedException)
\ No newline at end of file
diff --git a/src/conversions/jiff.rs b/src/conversions/jiff.rs
index fd2503646c0..01eba1988d2 100644
--- a/src/conversions/jiff.rs
+++ b/src/conversions/jiff.rs
@@ -533,31 +533,31 @@ mod tests {
             let none = py.None().into_bound(py);
             assert_eq!(
                 none.extract::<Span>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyDelta'"
+                "TypeError: 'NoneType' object cannot be converted to 'timedelta'"
             );
             assert_eq!(
                 none.extract::<Offset>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyTzInfo'"
+                "TypeError: 'NoneType' object cannot be converted to 'tzinfo'"
             );
             assert_eq!(
                 none.extract::<TimeZone>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyTzInfo'"
+                "TypeError: 'NoneType' object cannot be converted to 'tzinfo'"
             );
             assert_eq!(
                 none.extract::<Time>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyTime'"
+                "TypeError: 'NoneType' object cannot be converted to 'time'"
             );
             assert_eq!(
                 none.extract::<Date>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyDate'"
+                "TypeError: 'NoneType' object cannot be converted to 'date'"
             );
             assert_eq!(
                 none.extract::<DateTime>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyDateTime'"
+                "TypeError: 'NoneType' object cannot be converted to 'datetime'"
             );
             assert_eq!(
                 none.extract::<Zoned>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'PyDateTime'"
+                "TypeError: 'NoneType' object cannot be converted to 'datetime'"
             );
         });
     }
diff --git a/src/exceptions.rs b/src/exceptions.rs
index fca1cd63766..f3be7e92f4d 100644
--- a/src/exceptions.rs
+++ b/src/exceptions.rs
@@ -88,6 +88,7 @@ macro_rules! import_exception {
         $crate::pyobject_native_type_core!(
             $name,
             $name::type_object_raw,
+            stringify!($name),
             #module=::std::option::Option::Some(stringify!($module))
         );
 
@@ -124,6 +125,7 @@ macro_rules! import_exception_bound {
         $crate::pyobject_native_type_info!(
             $name,
             $name::type_object_raw,
+            stringify!($name),
             ::std::option::Option::Some(stringify!($module))
         );
 
@@ -247,6 +249,7 @@ macro_rules! create_exception_type_object {
         $crate::pyobject_native_type_core!(
             $name,
             $name::type_object_raw,
+            stringify!($name),
             #module=::std::option::Option::Some(stringify!($module))
         );
 
@@ -272,35 +275,35 @@ macro_rules! create_exception_type_object {
 }
 
 macro_rules! impl_native_exception (
-    ($name:ident, $exc_name:ident, $doc:expr, $layout:path $(, #checkfunction=$checkfunction:path)?) => (
+    ($rust_name:ident, $exc_name:ident, $python_name:expr, $doc:expr, $layout:path $(, #checkfunction=$checkfunction:path)?) => (
         #[doc = $doc]
         #[repr(transparent)]
         #[allow(clippy::upper_case_acronyms)]
-        pub struct $name($crate::PyAny);
+        pub struct $rust_name($crate::PyAny);
 
-        $crate::impl_exception_boilerplate!($name);
-        $crate::pyobject_native_type!($name, $layout, |_py| unsafe { $crate::ffi::$exc_name as *mut $crate::ffi::PyTypeObject } $(, #checkfunction=$checkfunction)?);
-        $crate::pyobject_subclassable_native_type!($name, $layout);
+        $crate::impl_exception_boilerplate!($rust_name);
+        $crate::pyobject_native_type!($rust_name, $layout, |_py| unsafe { $crate::ffi::$exc_name as *mut $crate::ffi::PyTypeObject }, $python_name $(, #checkfunction=$checkfunction)?);
+        $crate::pyobject_subclassable_native_type!($rust_name, $layout);
     );
-    ($name:ident, $exc_name:ident, $doc:expr) => (
-        impl_native_exception!($name, $exc_name, $doc, $crate::ffi::PyBaseExceptionObject);
+    ($rust_name:ident, $exc_name:ident, $python_name:expr, $doc:expr) => (
+        impl_native_exception!($rust_name, $exc_name, $python_name, $doc, $crate::ffi::PyBaseExceptionObject);
     )
 );
 
 #[cfg(windows)]
 macro_rules! impl_windows_native_exception (
-    ($name:ident, $exc_name:ident, $doc:expr, $layout:path) => (
+    ($rust_name:ident, $exc_name:ident, $python_name:expr, $doc:expr, $layout:path) => (
         #[cfg(windows)]
         #[doc = $doc]
         #[repr(transparent)]
         #[allow(clippy::upper_case_acronyms)]
-        pub struct $name($crate::PyAny);
+        pub struct $rust_name($crate::PyAny);
 
-        $crate::impl_exception_boilerplate!($name);
-        $crate::pyobject_native_type!($name, $layout, |_py| unsafe { $crate::ffi::$exc_name as *mut $crate::ffi::PyTypeObject });
+        $crate::impl_exception_boilerplate!($rust_name);
+        $crate::pyobject_native_type!($rust_name, $layout, |_py| unsafe { $crate::ffi::$exc_name as *mut $crate::ffi::PyTypeObject }, $python_name);
     );
-    ($name:ident, $exc_name:ident, $doc:expr) => (
-        impl_windows_native_exception!($name, $exc_name, $doc, $crate::ffi::PyBaseExceptionObject);
+    ($rust_name:ident, $exc_name:ident, $python_name:expr, $doc:expr) => (
+        impl_windows_native_exception!($rust_name, $exc_name, $python_name, $doc, $crate::ffi::PyBaseExceptionObject);
     )
 );
 
@@ -375,131 +378,216 @@ Python::attach(|py| {
 impl_native_exception!(
     PyBaseException,
     PyExc_BaseException,
+    "BaseException",
     native_doc!("BaseException"),
     ffi::PyBaseExceptionObject,
     #checkfunction=ffi::PyExceptionInstance_Check
 );
-impl_native_exception!(PyException, PyExc_Exception, native_doc!("Exception"));
+impl_native_exception!(
+    PyException,
+    PyExc_Exception,
+    "Exception",
+    native_doc!("Exception")
+);
 impl_native_exception!(
     PyStopAsyncIteration,
     PyExc_StopAsyncIteration,
+    "StopAsyncIteration",
     native_doc!("StopAsyncIteration")
 );
 impl_native_exception!(
     PyStopIteration,
     PyExc_StopIteration,
+    "StopIteration",
     native_doc!("StopIteration"),
     ffi::PyStopIterationObject
 );
 impl_native_exception!(
     PyGeneratorExit,
     PyExc_GeneratorExit,
+    "GeneratorExit",
     native_doc!("GeneratorExit")
 );
 impl_native_exception!(
     PyArithmeticError,
     PyExc_ArithmeticError,
+    "ArithmeticError",
     native_doc!("ArithmeticError")
 );
-impl_native_exception!(PyLookupError, PyExc_LookupError, native_doc!("LookupError"));
+impl_native_exception!(
+    PyLookupError,
+    PyExc_LookupError,
+    "LookupError",
+    native_doc!("LookupError")
+);
 
 impl_native_exception!(
     PyAssertionError,
     PyExc_AssertionError,
+    "AssertionError",
     native_doc!("AssertionError")
 );
 impl_native_exception!(
     PyAttributeError,
     PyExc_AttributeError,
+    "AttributeError",
     native_doc!("AttributeError")
 );
-impl_native_exception!(PyBufferError, PyExc_BufferError, native_doc!("BufferError"));
-impl_native_exception!(PyEOFError, PyExc_EOFError, native_doc!("EOFError"));
+impl_native_exception!(
+    PyBufferError,
+    PyExc_BufferError,
+    "BufferError",
+    native_doc!("BufferError")
+);
+impl_native_exception!(
+    PyEOFError,
+    PyExc_EOFError,
+    "EOFError",
+    native_doc!("EOFError")
+);
 impl_native_exception!(
     PyFloatingPointError,
     PyExc_FloatingPointError,
+    "FloatingPointError",
     native_doc!("FloatingPointError")
 );
 #[cfg(not(any(PyPy, GraalPy)))]
 impl_native_exception!(
     PyOSError,
     PyExc_OSError,
+    "OSError",
     native_doc!("OSError"),
     ffi::PyOSErrorObject
 );
 #[cfg(any(PyPy, GraalPy))]
-impl_native_exception!(PyOSError, PyExc_OSError, native_doc!("OSError"));
-impl_native_exception!(PyImportError, PyExc_ImportError, native_doc!("ImportError"));
+impl_native_exception!(PyOSError, PyExc_OSError, "OSError", native_doc!("OSError"));
+impl_native_exception!(
+    PyImportError,
+    PyExc_ImportError,
+    "ImportError",
+    native_doc!("ImportError")
+);
 
 impl_native_exception!(
     PyModuleNotFoundError,
     PyExc_ModuleNotFoundError,
+    "ModuleNotFoundError",
     native_doc!("ModuleNotFoundError")
 );
 
-impl_native_exception!(PyIndexError, PyExc_IndexError, native_doc!("IndexError"));
-impl_native_exception!(PyKeyError, PyExc_KeyError, native_doc!("KeyError"));
+impl_native_exception!(
+    PyIndexError,
+    PyExc_IndexError,
+    "IndexError",
+    native_doc!("IndexError")
+);
+impl_native_exception!(
+    PyKeyError,
+    PyExc_KeyError,
+    "KeyError",
+    native_doc!("KeyError")
+);
 impl_native_exception!(
     PyKeyboardInterrupt,
     PyExc_KeyboardInterrupt,
+    "KeyboardInterrupt",
     native_doc!("KeyboardInterrupt")
 );
-impl_native_exception!(PyMemoryError, PyExc_MemoryError, native_doc!("MemoryError"));
-impl_native_exception!(PyNameError, PyExc_NameError, native_doc!("NameError"));
+impl_native_exception!(
+    PyMemoryError,
+    PyExc_MemoryError,
+    "MemoryError",
+    native_doc!("MemoryError")
+);
+impl_native_exception!(
+    PyNameError,
+    PyExc_NameError,
+    "NameError",
+    native_doc!("NameError")
+);
 impl_native_exception!(
     PyOverflowError,
     PyExc_OverflowError,
+    "OverflowError",
     native_doc!("OverflowError")
 );
 impl_native_exception!(
     PyRuntimeError,
     PyExc_RuntimeError,
+    "RuntimeError",
     native_doc!("RuntimeError")
 );
 impl_native_exception!(
     PyRecursionError,
     PyExc_RecursionError,
+    "RecursionError",
     native_doc!("RecursionError")
 );
 impl_native_exception!(
     PyNotImplementedError,
     PyExc_NotImplementedError,
+    "NotImplementedError",
     native_doc!("NotImplementedError")
 );
 #[cfg(not(any(PyPy, GraalPy)))]
 impl_native_exception!(
     PySyntaxError,
     PyExc_SyntaxError,
+    "SyntaxError",
     native_doc!("SyntaxError"),
     ffi::PySyntaxErrorObject
 );
 #[cfg(any(PyPy, GraalPy))]
-impl_native_exception!(PySyntaxError, PyExc_SyntaxError, native_doc!("SyntaxError"));
+impl_native_exception!(
+    PySyntaxError,
+    PyExc_SyntaxError,
+    "SyntaxError",
+    native_doc!("SyntaxError")
+);
 impl_native_exception!(
     PyReferenceError,
     PyExc_ReferenceError,
+    "ReferenceError",
     native_doc!("ReferenceError")
 );
-impl_native_exception!(PySystemError, PyExc_SystemError, native_doc!("SystemError"));
+impl_native_exception!(
+    PySystemError,
+    PyExc_SystemError,
+    "SystemError",
+    native_doc!("SystemError")
+);
 #[cfg(not(any(PyPy, GraalPy)))]
 impl_native_exception!(
     PySystemExit,
     PyExc_SystemExit,
+    "SystemExit",
     native_doc!("SystemExit"),
     ffi::PySystemExitObject
 );
 #[cfg(any(PyPy, GraalPy))]
-impl_native_exception!(PySystemExit, PyExc_SystemExit, native_doc!("SystemExit"));
-impl_native_exception!(PyTypeError, PyExc_TypeError, native_doc!("TypeError"));
+impl_native_exception!(
+    PySystemExit,
+    PyExc_SystemExit,
+    "SystemExit",
+    native_doc!("SystemExit")
+);
+impl_native_exception!(
+    PyTypeError,
+    PyExc_TypeError,
+    "TypeError",
+    native_doc!("TypeError")
+);
 impl_native_exception!(
     PyUnboundLocalError,
     PyExc_UnboundLocalError,
+    "UnboundLocalError",
     native_doc!("UnboundLocalError")
 );
 #[cfg(not(any(PyPy, GraalPy)))]
 impl_native_exception!(
     PyUnicodeError,
     PyExc_UnicodeError,
+    "UnicodeError",
     native_doc!("UnicodeError"),
     ffi::PyUnicodeErrorObject
 );
@@ -507,124 +595,152 @@ impl_native_exception!(
 impl_native_exception!(
     PyUnicodeError,
     PyExc_UnicodeError,
+    "UnicodeError",
     native_doc!("UnicodeError")
 );
 // these four errors need arguments, so they're too annoying to write tests for using macros...
 impl_native_exception!(
     PyUnicodeDecodeError,
     PyExc_UnicodeDecodeError,
+    "UnicodeDecodeError",
     native_doc!("UnicodeDecodeError", "")
 );
 impl_native_exception!(
     PyUnicodeEncodeError,
     PyExc_UnicodeEncodeError,
+    "UnicodeEncodeError",
     native_doc!("UnicodeEncodeError", "")
 );
 impl_native_exception!(
     PyUnicodeTranslateError,
     PyExc_UnicodeTranslateError,
+    "UnicodeTranslateError",
     native_doc!("UnicodeTranslateError", "")
 );
 #[cfg(Py_3_11)]
 impl_native_exception!(
     PyBaseExceptionGroup,
     PyExc_BaseExceptionGroup,
+    "BaseExceptionGroup",
     native_doc!("BaseExceptionGroup", "")
 );
-impl_native_exception!(PyValueError, PyExc_ValueError, native_doc!("ValueError"));
+impl_native_exception!(
+    PyValueError,
+    PyExc_ValueError,
+    "ValueError",
+    native_doc!("ValueError")
+);
 impl_native_exception!(
     PyZeroDivisionError,
     PyExc_ZeroDivisionError,
+    "ZeroDivisionError",
     native_doc!("ZeroDivisionError")
 );
 
 impl_native_exception!(
     PyBlockingIOError,
     PyExc_BlockingIOError,
+    "BlockingIOError",
     native_doc!("BlockingIOError")
 );
 impl_native_exception!(
     PyBrokenPipeError,
     PyExc_BrokenPipeError,
+    "BrokenPipeError",
     native_doc!("BrokenPipeError")
 );
 impl_native_exception!(
     PyChildProcessError,
     PyExc_ChildProcessError,
+    "ChildProcessError",
     native_doc!("ChildProcessError")
 );
 impl_native_exception!(
     PyConnectionError,
     PyExc_ConnectionError,
+    "ConnectionError",
     native_doc!("ConnectionError")
 );
 impl_native_exception!(
     PyConnectionAbortedError,
     PyExc_ConnectionAbortedError,
+    "ConnectionAbortedError",
     native_doc!("ConnectionAbortedError")
 );
 impl_native_exception!(
     PyConnectionRefusedError,
     PyExc_ConnectionRefusedError,
+    "ConnectionRefusedError",
     native_doc!("ConnectionRefusedError")
 );
 impl_native_exception!(
     PyConnectionResetError,
     PyExc_ConnectionResetError,
+    "ConnectionResetError",
     native_doc!("ConnectionResetError")
 );
 impl_native_exception!(
     PyFileExistsError,
     PyExc_FileExistsError,
+    "FileExistsError",
     native_doc!("FileExistsError")
 );
 impl_native_exception!(
     PyFileNotFoundError,
     PyExc_FileNotFoundError,
+    "FileNotFoundError",
     native_doc!("FileNotFoundError")
 );
 impl_native_exception!(
     PyInterruptedError,
     PyExc_InterruptedError,
+    "InterruptedError",
     native_doc!("InterruptedError")
 );
 impl_native_exception!(
     PyIsADirectoryError,
     PyExc_IsADirectoryError,
+    "IsADirectoryError",
     native_doc!("IsADirectoryError")
 );
 impl_native_exception!(
     PyNotADirectoryError,
     PyExc_NotADirectoryError,
+    "NotADirectoryError",
     native_doc!("NotADirectoryError")
 );
 impl_native_exception!(
     PyPermissionError,
     PyExc_PermissionError,
+    "PermissionError",
     native_doc!("PermissionError")
 );
 impl_native_exception!(
     PyProcessLookupError,
     PyExc_ProcessLookupError,
+    "ProcessLookupError",
     native_doc!("ProcessLookupError")
 );
 impl_native_exception!(
     PyTimeoutError,
     PyExc_TimeoutError,
+    "TimeoutError",
     native_doc!("TimeoutError")
 );
 
 impl_native_exception!(
     PyEnvironmentError,
     PyExc_EnvironmentError,
+    "EnvironmentError",
     native_doc!("EnvironmentError")
 );
-impl_native_exception!(PyIOError, PyExc_IOError, native_doc!("IOError"));
+impl_native_exception!(PyIOError, PyExc_IOError, "IOError", native_doc!("IOError"));
 
 #[cfg(windows)]
 impl_windows_native_exception!(
     PyWindowsError,
     PyExc_WindowsError,
+    "WindowsError",
     native_doc!("WindowsError")
 );
 
@@ -690,51 +806,65 @@ impl PyUnicodeDecodeError {
     }
 }
 
-impl_native_exception!(PyWarning, PyExc_Warning, native_doc!("Warning"));
-impl_native_exception!(PyUserWarning, PyExc_UserWarning, native_doc!("UserWarning"));
+impl_native_exception!(PyWarning, PyExc_Warning, "Warning", native_doc!("Warning"));
+impl_native_exception!(
+    PyUserWarning,
+    PyExc_UserWarning,
+    "UserWarning",
+    native_doc!("UserWarning")
+);
 impl_native_exception!(
     PyDeprecationWarning,
     PyExc_DeprecationWarning,
+    "DeprecationWarning",
     native_doc!("DeprecationWarning")
 );
 impl_native_exception!(
     PyPendingDeprecationWarning,
     PyExc_PendingDeprecationWarning,
+    "PendingDeprecationWarning",
     native_doc!("PendingDeprecationWarning")
 );
 impl_native_exception!(
     PySyntaxWarning,
     PyExc_SyntaxWarning,
+    "SyntaxWarning",
     native_doc!("SyntaxWarning")
 );
 impl_native_exception!(
     PyRuntimeWarning,
     PyExc_RuntimeWarning,
+    "RuntimeWarning",
     native_doc!("RuntimeWarning")
 );
 impl_native_exception!(
     PyFutureWarning,
     PyExc_FutureWarning,
+    "FutureWarning",
     native_doc!("FutureWarning")
 );
 impl_native_exception!(
     PyImportWarning,
     PyExc_ImportWarning,
+    "ImportWarning",
     native_doc!("ImportWarning")
 );
 impl_native_exception!(
     PyUnicodeWarning,
     PyExc_UnicodeWarning,
+    "UnicodeWarning",
     native_doc!("UnicodeWarning")
 );
 impl_native_exception!(
     PyBytesWarning,
     PyExc_BytesWarning,
+    "BytesWarning",
     native_doc!("BytesWarning")
 );
 impl_native_exception!(
     PyResourceWarning,
     PyExc_ResourceWarning,
+    "ResourceWarning",
     native_doc!("ResourceWarning")
 );
 
@@ -742,6 +872,7 @@ impl_native_exception!(
 impl_native_exception!(
     PyEncodingWarning,
     PyExc_EncodingWarning,
+    "EncodingWarning",
     native_doc!("EncodingWarning")
 );
 
diff --git a/src/types/any.rs b/src/types/any.rs
index fb3d97b55ce..4e9c1c42a48 100644
--- a/src/types/any.rs
+++ b/src/types/any.rs
@@ -41,7 +41,8 @@ fn PyObject_Check(_: *mut ffi::PyObject) -> c_int {
 pyobject_native_type_info!(
     PyAny,
     pyobject_native_static_type_object!(ffi::PyBaseObject_Type),
-    Some("builtins"),
+    "object",
+    None,
     #checkfunction=PyObject_Check
 );
 
diff --git a/src/types/boolobject.rs b/src/types/boolobject.rs
index 51a0dbb346a..f525285acaf 100644
--- a/src/types/boolobject.rs
+++ b/src/types/boolobject.rs
@@ -20,7 +20,7 @@ use std::ptr;
 #[repr(transparent)]
 pub struct PyBool(PyAny);
 
-pyobject_native_type!(PyBool, ffi::PyObject, pyobject_native_static_type_object!(ffi::PyBool_Type), #checkfunction=ffi::PyBool_Check);
+pyobject_native_type!(PyBool, ffi::PyObject, pyobject_native_static_type_object!(ffi::PyBool_Type), "bool", #checkfunction=ffi::PyBool_Check);
 
 impl PyBool {
     /// Depending on `val`, returns `true` or `false`.
diff --git a/src/types/bytearray.rs b/src/types/bytearray.rs
index c85c20f12f4..7c26bf2ea1a 100644
--- a/src/types/bytearray.rs
+++ b/src/types/bytearray.rs
@@ -16,7 +16,7 @@ use std::slice;
 #[repr(transparent)]
 pub struct PyByteArray(PyAny);
 
-pyobject_native_type_core!(PyByteArray, pyobject_native_static_type_object!(ffi::PyByteArray_Type), #checkfunction=ffi::PyByteArray_Check);
+pyobject_native_type_core!(PyByteArray, pyobject_native_static_type_object!(ffi::PyByteArray_Type), "bytearray", #checkfunction=ffi::PyByteArray_Check);
 
 impl PyByteArray {
     /// Creates a new Python bytearray object.
diff --git a/src/types/bytes.rs b/src/types/bytes.rs
index 136f6361b27..a8897ec4698 100644
--- a/src/types/bytes.rs
+++ b/src/types/bytes.rs
@@ -47,7 +47,7 @@ use std::str;
 #[repr(transparent)]
 pub struct PyBytes(PyAny);
 
-pyobject_native_type_core!(PyBytes, pyobject_native_static_type_object!(ffi::PyBytes_Type), #checkfunction=ffi::PyBytes_Check);
+pyobject_native_type_core!(PyBytes, pyobject_native_static_type_object!(ffi::PyBytes_Type), "bytes", #checkfunction=ffi::PyBytes_Check);
 
 impl PyBytes {
     /// Creates a new Python bytestring object.
diff --git a/src/types/capsule.rs b/src/types/capsule.rs
index 0d8849535ed..baf827f6038 100644
--- a/src/types/capsule.rs
+++ b/src/types/capsule.rs
@@ -47,7 +47,7 @@ use std::ffi::{CStr, CString};
 #[repr(transparent)]
 pub struct PyCapsule(PyAny);
 
-pyobject_native_type_core!(PyCapsule, pyobject_native_static_type_object!(ffi::PyCapsule_Type), #checkfunction=ffi::PyCapsule_CheckExact);
+pyobject_native_type_core!(PyCapsule, pyobject_native_static_type_object!(ffi::PyCapsule_Type), "PyCapsule", #checkfunction=ffi::PyCapsule_CheckExact);
 
 impl PyCapsule {
     /// Constructs a new capsule whose contents are `value`, associated with `name`.
diff --git a/src/types/code.rs b/src/types/code.rs
index dbd12ee6075..56c1fb87be9 100644
--- a/src/types/code.rs
+++ b/src/types/code.rs
@@ -16,6 +16,7 @@ pub struct PyCode(PyAny);
 pyobject_native_type_core!(
     PyCode,
     pyobject_native_static_type_object!(ffi::PyCode_Type),
+    "PyCode",
     #checkfunction=ffi::PyCode_Check
 );
 
@@ -24,7 +25,7 @@ pyobject_native_type_named!(PyCode);
 
 #[cfg(any(Py_LIMITED_API, PyPy))]
 impl crate::PyTypeCheck for PyCode {
-    const NAME: &'static str = "PyCode";
+    const NAME: &'static str = "codeobject";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "types.CodeType";
 
diff --git a/src/types/complex.rs b/src/types/complex.rs
index d2624875733..16755ab81d7 100644
--- a/src/types/complex.rs
+++ b/src/types/complex.rs
@@ -27,6 +27,7 @@ pyobject_native_type!(
     PyComplex,
     ffi::PyComplexObject,
     pyobject_native_static_type_object!(ffi::PyComplex_Type),
+    "complex",
     #checkfunction=ffi::PyComplex_Check
 );
 
diff --git a/src/types/datetime.rs b/src/types/datetime.rs
index adca98e9878..facca231b67 100644
--- a/src/types/datetime.rs
+++ b/src/types/datetime.rs
@@ -227,6 +227,7 @@ pyobject_native_type!(
     PyDate,
     crate::ffi::PyDateTime_Date,
     |py| expect_datetime_api(py).DateType,
+    "date",
     #module=Some("datetime"),
     #checkfunction=PyDate_Check
 );
@@ -238,7 +239,7 @@ pyobject_native_type_named!(PyDate);
 
 #[cfg(Py_LIMITED_API)]
 impl PyTypeCheck for PyDate {
-    const NAME: &'static str = "PyDate";
+    const NAME: &'static str = "date";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "datetime.date";
 
@@ -328,6 +329,7 @@ pyobject_native_type!(
     PyDateTime,
     crate::ffi::PyDateTime_DateTime,
     |py| expect_datetime_api(py).DateTimeType,
+    "datetime",
     #module=Some("datetime"),
     #checkfunction=PyDateTime_Check
 );
@@ -339,7 +341,7 @@ pyobject_native_type_named!(PyDateTime);
 
 #[cfg(Py_LIMITED_API)]
 impl PyTypeCheck for PyDateTime {
-    const NAME: &'static str = "PyDateTime";
+    const NAME: &'static str = "datetime";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "datetime.datetime";
 
@@ -579,6 +581,7 @@ pyobject_native_type!(
     PyTime,
     crate::ffi::PyDateTime_Time,
     |py| expect_datetime_api(py).TimeType,
+    "time",
     #module=Some("datetime"),
     #checkfunction=PyTime_Check
 );
@@ -590,7 +593,7 @@ pyobject_native_type_named!(PyTime);
 
 #[cfg(Py_LIMITED_API)]
 impl PyTypeCheck for PyTime {
-    const NAME: &'static str = "PyTime";
+    const NAME: &'static str = "time";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "datetime.time";
 
@@ -765,6 +768,7 @@ pyobject_native_type!(
     PyTzInfo,
     crate::ffi::PyObject,
     |py| expect_datetime_api(py).TZInfoType,
+    "tzinfo",
     #module=Some("datetime"),
     #checkfunction=PyTZInfo_Check
 );
@@ -776,7 +780,7 @@ pyobject_native_type_named!(PyTzInfo);
 
 #[cfg(Py_LIMITED_API)]
 impl PyTypeCheck for PyTzInfo {
-    const NAME: &'static str = "PyTzInfo";
+    const NAME: &'static str = "tzinfo";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "datetime.tzinfo";
 
@@ -881,6 +885,7 @@ pyobject_native_type!(
     PyDelta,
     crate::ffi::PyDateTime_Delta,
     |py| expect_datetime_api(py).DeltaType,
+    "timedelta",
     #module=Some("datetime"),
     #checkfunction=PyDelta_Check
 );
@@ -892,7 +897,7 @@ pyobject_native_type_named!(PyDelta);
 
 #[cfg(Py_LIMITED_API)]
 impl PyTypeCheck for PyDelta {
-    const NAME: &'static str = "PyDelta";
+    const NAME: &'static str = "timedelta";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "datetime.timedelta";
 
diff --git a/src/types/dict.rs b/src/types/dict.rs
index 15d31e06f49..bb9fc1f33c1 100644
--- a/src/types/dict.rs
+++ b/src/types/dict.rs
@@ -22,6 +22,7 @@ pyobject_native_type!(
     PyDict,
     ffi::PyDictObject,
     pyobject_native_static_type_object!(ffi::PyDict_Type),
+    "dict",
     #checkfunction=ffi::PyDict_Check
 );
 
@@ -34,6 +35,7 @@ pub struct PyDictKeys(PyAny);
 pyobject_native_type_core!(
     PyDictKeys,
     pyobject_native_static_type_object!(ffi::PyDictKeys_Type),
+    "PyDictKeys",
     #checkfunction=ffi::PyDictKeys_Check
 );
 
@@ -46,6 +48,7 @@ pub struct PyDictValues(PyAny);
 pyobject_native_type_core!(
     PyDictValues,
     pyobject_native_static_type_object!(ffi::PyDictValues_Type),
+    "PyDictValues",
     #checkfunction=ffi::PyDictValues_Check
 );
 
@@ -58,6 +61,7 @@ pub struct PyDictItems(PyAny);
 pyobject_native_type_core!(
     PyDictItems,
     pyobject_native_static_type_object!(ffi::PyDictItems_Type),
+    "PyDictItems",
     #checkfunction=ffi::PyDictItems_Check
 );
 
diff --git a/src/types/float.rs b/src/types/float.rs
index 62a7ae40bcb..4b3d1e7e0f0 100644
--- a/src/types/float.rs
+++ b/src/types/float.rs
@@ -29,6 +29,7 @@ pyobject_native_type!(
     PyFloat,
     ffi::PyFloatObject,
     pyobject_native_static_type_object!(ffi::PyFloat_Type),
+    "float",
     #checkfunction=ffi::PyFloat_Check
 );
 
diff --git a/src/types/frame.rs b/src/types/frame.rs
index 8d88d4754ae..fda55870bca 100644
--- a/src/types/frame.rs
+++ b/src/types/frame.rs
@@ -11,5 +11,6 @@ pub struct PyFrame(PyAny);
 pyobject_native_type_core!(
     PyFrame,
     pyobject_native_static_type_object!(ffi::PyFrame_Type),
+    "PyFrame",
     #checkfunction=ffi::PyFrame_Check
 );
diff --git a/src/types/frozenset.rs b/src/types/frozenset.rs
index 45787a13b63..27951f76604 100644
--- a/src/types/frozenset.rs
+++ b/src/types/frozenset.rs
@@ -67,6 +67,7 @@ pyobject_native_type!(
     PyFrozenSet,
     ffi::PySetObject,
     pyobject_native_static_type_object!(ffi::PyFrozenSet_Type),
+    "frozenset",
     #checkfunction=ffi::PyFrozenSet_Check
 );
 
@@ -74,6 +75,7 @@ pyobject_native_type!(
 pyobject_native_type_core!(
     PyFrozenSet,
     pyobject_native_static_type_object!(ffi::PyFrozenSet_Type),
+    "frozenset",
     #checkfunction=ffi::PyFrozenSet_Check
 );
 
diff --git a/src/types/function.rs b/src/types/function.rs
index fa822b5faa0..d58069ad92c 100644
--- a/src/types/function.rs
+++ b/src/types/function.rs
@@ -18,7 +18,7 @@ use std::ffi::CStr;
 #[repr(transparent)]
 pub struct PyCFunction(PyAny);
 
-pyobject_native_type_core!(PyCFunction, pyobject_native_static_type_object!(ffi::PyCFunction_Type), #checkfunction=ffi::PyCFunction_Check);
+pyobject_native_type_core!(PyCFunction, pyobject_native_static_type_object!(ffi::PyCFunction_Type), "PyCFunction", #checkfunction=ffi::PyCFunction_Check);
 
 impl PyCFunction {
     /// Create a new built-in function with keywords (*args and/or **kwargs).
@@ -184,4 +184,4 @@ unsafe impl<F: Send> Send for ClosureDestructor<F> {}
 pub struct PyFunction(PyAny);
 
 #[cfg(not(Py_LIMITED_API))]
-pyobject_native_type_core!(PyFunction, pyobject_native_static_type_object!(ffi::PyFunction_Type), #checkfunction=ffi::PyFunction_Check);
+pyobject_native_type_core!(PyFunction, pyobject_native_static_type_object!(ffi::PyFunction_Type), "PyFunction", #checkfunction=ffi::PyFunction_Check);
diff --git a/src/types/genericalias.rs b/src/types/genericalias.rs
index 04e0407784e..2c78de3b2e6 100644
--- a/src/types/genericalias.rs
+++ b/src/types/genericalias.rs
@@ -17,7 +17,8 @@ pub struct PyGenericAlias(PyAny);
 pyobject_native_type!(
     PyGenericAlias,
     ffi::PyDictObject,
-    pyobject_native_static_type_object!(ffi::Py_GenericAliasType)
+    pyobject_native_static_type_object!(ffi::Py_GenericAliasType),
+    "GenericAlias"
 );
 
 impl PyGenericAlias {
diff --git a/src/types/list.rs b/src/types/list.rs
index 0a2a32a3760..d64bb95ed1c 100644
--- a/src/types/list.rs
+++ b/src/types/list.rs
@@ -19,7 +19,7 @@ use std::num::NonZero;
 #[repr(transparent)]
 pub struct PyList(PyAny);
 
-pyobject_native_type_core!(PyList, pyobject_native_static_type_object!(ffi::PyList_Type), #checkfunction=ffi::PyList_Check);
+pyobject_native_type_core!(PyList, pyobject_native_static_type_object!(ffi::PyList_Type), "list", #checkfunction=ffi::PyList_Check);
 
 #[inline]
 #[track_caller]
diff --git a/src/types/mappingproxy.rs b/src/types/mappingproxy.rs
index 478621a7163..374eeb036e6 100644
--- a/src/types/mappingproxy.rs
+++ b/src/types/mappingproxy.rs
@@ -22,6 +22,7 @@ unsafe fn dict_proxy_check(op: *mut ffi::PyObject) -> c_int {
 pyobject_native_type_core!(
     PyMappingProxy,
     pyobject_native_static_type_object!(ffi::PyDictProxy_Type),
+    "mappingproxy",
     #checkfunction=dict_proxy_check
 );
 
diff --git a/src/types/memoryview.rs b/src/types/memoryview.rs
index cdb252e72d2..ba2d58b74a1 100644
--- a/src/types/memoryview.rs
+++ b/src/types/memoryview.rs
@@ -10,7 +10,7 @@ use crate::{ffi, Bound, PyAny};
 #[repr(transparent)]
 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), "memoryview", #checkfunction=ffi::PyMemoryView_Check);
 
 impl PyMemoryView {
     /// Creates a new Python `memoryview` object from another Python object that
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 3def87297dd..a970e2e65d3 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -139,9 +139,9 @@ macro_rules! pyobject_native_static_type_object(
 #[doc(hidden)]
 #[macro_export]
 macro_rules! pyobject_native_type_info(
-    ($name:ty, $typeobject:expr, $module:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
-        unsafe impl<$($generics,)*> $crate::type_object::PyTypeInfo for $name {
-            const NAME: &'static str = stringify!($name);
+    ($rust_name:ty, $typeobject:expr, $python_name:expr, $module:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
+        unsafe impl<$($generics,)*> $crate::type_object::PyTypeInfo for $rust_name {
+            const NAME: &'static str = $python_name;
             const MODULE: ::std::option::Option<&'static str> = $module;
 
             #[inline]
@@ -159,13 +159,13 @@ macro_rules! pyobject_native_type_info(
             )?
         }
 
-        impl $name {
+        impl $rust_name {
             #[doc(hidden)]
             pub const _PYO3_DEF: $crate::impl_::pymodule::AddTypeToModule<Self> = $crate::impl_::pymodule::AddTypeToModule::new();
 
             #[allow(dead_code)]
             #[doc(hidden)]
-            pub const _PYO3_INTROSPECTION_ID: &'static str = concat!(stringify!($module), stringify!($name));
+            pub const _PYO3_INTROSPECTION_ID: &'static str = concat!(stringify!($module), stringify!($rust_name));
         }
     };
 );
@@ -174,12 +174,12 @@ macro_rules! pyobject_native_type_info(
 #[doc(hidden)]
 #[macro_export]
 macro_rules! pyobject_native_type_core {
-    ($name:ty, $typeobject:expr, #module=$module:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
-        $crate::pyobject_native_type_named!($name $(;$generics)*);
-        $crate::pyobject_native_type_info!($name, $typeobject, $module $(, #checkfunction=$checkfunction)? $(;$generics)*);
+    ($rust_name:ty, $typeobject:expr, $python_name:expr, #module=$module:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
+        $crate::pyobject_native_type_named!($rust_name $(;$generics)*);
+        $crate::pyobject_native_type_info!($rust_name, $typeobject, stringify!($rust_name), $module $(, #checkfunction=$checkfunction)? $(;$generics)*);
     };
-    ($name:ty, $typeobject:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
-        $crate::pyobject_native_type_core!($name, $typeobject, #module=::std::option::Option::Some("builtins") $(, #checkfunction=$checkfunction)? $(;$generics)*);
+    ($rust_name:ty, $typeobject:expr, $python_name:expr $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
+        $crate::pyobject_native_type_core!($rust_name, $typeobject, $python_name, #module=::std::option::Option::Some("builtins") $(, #checkfunction=$checkfunction)? $(;$generics)*);
     };
 }
 
@@ -211,11 +211,11 @@ macro_rules! pyobject_native_type_sized {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! pyobject_native_type {
-    ($name:ty, $layout:path, $typeobject:expr $(, #module=$module:expr)? $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
-        $crate::pyobject_native_type_core!($name, $typeobject $(, #module=$module)? $(, #checkfunction=$checkfunction)? $(;$generics)*);
+    ($rust_name:ty, $layout:path, $typeobject:expr, $python_name:expr $(, #module=$module:expr)? $(, #checkfunction=$checkfunction:path)? $(;$generics:ident)*) => {
+        $crate::pyobject_native_type_core!($rust_name, $typeobject, $python_name $(, #module=$module)? $(, #checkfunction=$checkfunction)? $(;$generics)*);
         // To prevent inheriting native types with ABI3
         #[cfg(not(Py_LIMITED_API))]
-        $crate::pyobject_native_type_sized!($name, $layout $(;$generics)*);
+        $crate::pyobject_native_type_sized!($rust_name, $layout $(;$generics)*);
     };
 }
 
diff --git a/src/types/module.rs b/src/types/module.rs
index 72ba2d341d9..1df96534e5b 100644
--- a/src/types/module.rs
+++ b/src/types/module.rs
@@ -32,7 +32,7 @@ use std::str;
 #[repr(transparent)]
 pub struct PyModule(PyAny);
 
-pyobject_native_type_core!(PyModule, pyobject_native_static_type_object!(ffi::PyModule_Type), #checkfunction=ffi::PyModule_Check);
+pyobject_native_type_core!(PyModule, pyobject_native_static_type_object!(ffi::PyModule_Type), "module", #checkfunction=ffi::PyModule_Check);
 
 impl PyModule {
     /// Creates a new module object with the `__name__` attribute set to `name`.
diff --git a/src/types/num.rs b/src/types/num.rs
index 41ecb5ea527..0cf5da87d44 100644
--- a/src/types/num.rs
+++ b/src/types/num.rs
@@ -13,7 +13,7 @@ use std::convert::Infallible;
 #[repr(transparent)]
 pub struct PyInt(PyAny);
 
-pyobject_native_type_core!(PyInt, pyobject_native_static_type_object!(ffi::PyLong_Type), #checkfunction=ffi::PyLong_Check);
+pyobject_native_type_core!(PyInt, pyobject_native_static_type_object!(ffi::PyLong_Type), "int", #checkfunction=ffi::PyLong_Check);
 
 impl PyInt {
     /// Creates a new Python int object.
diff --git a/src/types/pysuper.rs b/src/types/pysuper.rs
index b8f3cef2d06..af8f614a043 100644
--- a/src/types/pysuper.rs
+++ b/src/types/pysuper.rs
@@ -13,7 +13,8 @@ pub struct PySuper(PyAny);
 
 pyobject_native_type_core!(
     PySuper,
-    pyobject_native_static_type_object!(ffi::PySuper_Type)
+    pyobject_native_static_type_object!(ffi::PySuper_Type),
+    "super"
 );
 
 impl PySuper {
diff --git a/src/types/range.rs b/src/types/range.rs
index 00c7ce2a325..0823f556636 100644
--- a/src/types/range.rs
+++ b/src/types/range.rs
@@ -12,7 +12,7 @@ use crate::{ffi, Bound, PyAny, PyResult, PyTypeInfo, Python};
 #[repr(transparent)]
 pub struct PyRange(PyAny);
 
-pyobject_native_type_core!(PyRange, pyobject_native_static_type_object!(ffi::PyRange_Type), #checkfunction=ffi::PyRange_Check);
+pyobject_native_type_core!(PyRange, pyobject_native_static_type_object!(ffi::PyRange_Type), "range",#checkfunction=ffi::PyRange_Check);
 
 impl<'py> PyRange {
     /// Creates a new Python `range` object with a default step of 1.
diff --git a/src/types/set.rs b/src/types/set.rs
index cdc920b0c12..9c382f0493d 100644
--- a/src/types/set.rs
+++ b/src/types/set.rs
@@ -26,6 +26,7 @@ pyobject_native_type!(
     PySet,
     ffi::PySetObject,
     pyobject_native_static_type_object!(ffi::PySet_Type),
+    "set",
     #checkfunction=ffi::PySet_Check
 );
 
@@ -33,6 +34,7 @@ pyobject_native_type!(
 pyobject_native_type_core!(
     PySet,
     pyobject_native_static_type_object!(ffi::PySet_Type),
+    "set",
     #checkfunction=ffi::PySet_Check
 );
 
diff --git a/src/types/slice.rs b/src/types/slice.rs
index 78248d54c40..671482c4373 100644
--- a/src/types/slice.rs
+++ b/src/types/slice.rs
@@ -21,6 +21,7 @@ pyobject_native_type!(
     PySlice,
     ffi::PySliceObject,
     pyobject_native_static_type_object!(ffi::PySlice_Type),
+    "slice",
     #checkfunction=ffi::PySlice_Check
 );
 
diff --git a/src/types/string.rs b/src/types/string.rs
index 1baa6a18eeb..365be41e266 100644
--- a/src/types/string.rs
+++ b/src/types/string.rs
@@ -152,7 +152,7 @@ impl<'a> PyStringData<'a> {
 #[repr(transparent)]
 pub struct PyString(PyAny);
 
-pyobject_native_type_core!(PyString, pyobject_native_static_type_object!(ffi::PyUnicode_Type), #checkfunction=ffi::PyUnicode_Check);
+pyobject_native_type_core!(PyString, pyobject_native_static_type_object!(ffi::PyUnicode_Type), "str", #checkfunction=ffi::PyUnicode_Check);
 
 impl PyString {
     /// Creates a new Python string object.
diff --git a/src/types/traceback.rs b/src/types/traceback.rs
index 1d6f88d1afe..b609e6b2f2a 100644
--- a/src/types/traceback.rs
+++ b/src/types/traceback.rs
@@ -15,6 +15,7 @@ pub struct PyTraceback(PyAny);
 pyobject_native_type_core!(
     PyTraceback,
     pyobject_native_static_type_object!(ffi::PyTraceBack_Type),
+    "traceback",
     #checkfunction=ffi::PyTraceBack_Check
 );
 
diff --git a/src/types/tuple.rs b/src/types/tuple.rs
index 0669b6e345f..a83cef880e7 100644
--- a/src/types/tuple.rs
+++ b/src/types/tuple.rs
@@ -58,7 +58,7 @@ fn try_new_from_iter<'py>(
 #[repr(transparent)]
 pub struct PyTuple(PyAny);
 
-pyobject_native_type_core!(PyTuple, pyobject_native_static_type_object!(ffi::PyTuple_Type), #checkfunction=ffi::PyTuple_Check);
+pyobject_native_type_core!(PyTuple, pyobject_native_static_type_object!(ffi::PyTuple_Type), "tuple", #checkfunction=ffi::PyTuple_Check);
 
 impl PyTuple {
     /// Constructs a new tuple with the given elements.
diff --git a/src/types/typeobject.rs b/src/types/typeobject.rs
index 58c94d46cf4..48877d60db3 100644
--- a/src/types/typeobject.rs
+++ b/src/types/typeobject.rs
@@ -19,7 +19,7 @@ use super::PyString;
 #[repr(transparent)]
 pub struct PyType(PyAny);
 
-pyobject_native_type_core!(PyType, pyobject_native_static_type_object!(ffi::PyType_Type), #checkfunction=ffi::PyType_Check);
+pyobject_native_type_core!(PyType, pyobject_native_static_type_object!(ffi::PyType_Type), "type", #checkfunction=ffi::PyType_Check);
 
 impl PyType {
     /// Creates a new type object.
diff --git a/src/types/weakref/reference.rs b/src/types/weakref/reference.rs
index f008b2cd252..b725d3af1f8 100644
--- a/src/types/weakref/reference.rs
+++ b/src/types/weakref/reference.rs
@@ -24,6 +24,7 @@ pyobject_native_type!(
     ffi::PyWeakReference,
     // TODO: should not be depending on a private symbol here!
     pyobject_native_static_type_object!(ffi::_PyWeakref_RefType),
+    "ReferenceType",
     #module=Some("weakref"),
     #checkfunction=ffi::PyWeakref_CheckRefExact
 );

From 33c0d91cd5e04919d733ec2ad0a1aeffab91e219 Mon Sep 17 00:00:00 2001
From: Thomas Pellissier-Tanon <thomas.pellissier-tanon@helsing.ai>
Date: Mon, 25 Aug 2025 10:41:40 +0200
Subject: [PATCH 2/7] Code review feedback

---
 src/types/any.rs      | 2 +-
 src/types/dict.rs     | 6 +++---
 src/types/function.rs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/types/any.rs b/src/types/any.rs
index 4e9c1c42a48..9796e2d963f 100644
--- a/src/types/any.rs
+++ b/src/types/any.rs
@@ -42,7 +42,7 @@ pyobject_native_type_info!(
     PyAny,
     pyobject_native_static_type_object!(ffi::PyBaseObject_Type),
     "object",
-    None,
+    Some("builtins"),
     #checkfunction=PyObject_Check
 );
 
diff --git a/src/types/dict.rs b/src/types/dict.rs
index bb9fc1f33c1..f49b7892a98 100644
--- a/src/types/dict.rs
+++ b/src/types/dict.rs
@@ -35,7 +35,7 @@ pub struct PyDictKeys(PyAny);
 pyobject_native_type_core!(
     PyDictKeys,
     pyobject_native_static_type_object!(ffi::PyDictKeys_Type),
-    "PyDictKeys",
+    "dict_keys",
     #checkfunction=ffi::PyDictKeys_Check
 );
 
@@ -48,7 +48,7 @@ pub struct PyDictValues(PyAny);
 pyobject_native_type_core!(
     PyDictValues,
     pyobject_native_static_type_object!(ffi::PyDictValues_Type),
-    "PyDictValues",
+    "dict_values",
     #checkfunction=ffi::PyDictValues_Check
 );
 
@@ -61,7 +61,7 @@ pub struct PyDictItems(PyAny);
 pyobject_native_type_core!(
     PyDictItems,
     pyobject_native_static_type_object!(ffi::PyDictItems_Type),
-    "PyDictItems",
+    "dict_items",
     #checkfunction=ffi::PyDictItems_Check
 );
 
diff --git a/src/types/function.rs b/src/types/function.rs
index d58069ad92c..f30e7cd2578 100644
--- a/src/types/function.rs
+++ b/src/types/function.rs
@@ -18,7 +18,7 @@ use std::ffi::CStr;
 #[repr(transparent)]
 pub struct PyCFunction(PyAny);
 
-pyobject_native_type_core!(PyCFunction, pyobject_native_static_type_object!(ffi::PyCFunction_Type), "PyCFunction", #checkfunction=ffi::PyCFunction_Check);
+pyobject_native_type_core!(PyCFunction, pyobject_native_static_type_object!(ffi::PyCFunction_Type), "builtin_function_or_method", #checkfunction=ffi::PyCFunction_Check);
 
 impl PyCFunction {
     /// Create a new built-in function with keywords (*args and/or **kwargs).
@@ -184,4 +184,4 @@ unsafe impl<F: Send> Send for ClosureDestructor<F> {}
 pub struct PyFunction(PyAny);
 
 #[cfg(not(Py_LIMITED_API))]
-pyobject_native_type_core!(PyFunction, pyobject_native_static_type_object!(ffi::PyFunction_Type), "PyFunction", #checkfunction=ffi::PyFunction_Check);
+pyobject_native_type_core!(PyFunction, pyobject_native_static_type_object!(ffi::PyFunction_Type), "function", #checkfunction=ffi::PyFunction_Check);

From b7ca94b4ed463e2c652b76d312c759a7b9080b8b Mon Sep 17 00:00:00 2001
From: Thomas Pellissier-Tanon <thomas.pellissier-tanon@helsing.ai>
Date: Mon, 25 Aug 2025 15:55:33 +0200
Subject: [PATCH 3/7] Fixes tests

---
 src/conversions/chrono.rs |  1 +
 src/conversions/jiff.rs   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/conversions/chrono.rs b/src/conversions/chrono.rs
index 5ea8904fca2..8921aafd1c0 100644
--- a/src/conversions/chrono.rs
+++ b/src/conversions/chrono.rs
@@ -661,6 +661,7 @@ mod tests {
         });
     }
 
+    #[cfg(not(Py_LIMITED_API))]
     #[test]
     fn test_invalid_types_fail() {
         // Test that if a user tries to convert a python's timezone aware datetime into a naive
diff --git a/src/conversions/jiff.rs b/src/conversions/jiff.rs
index 01eba1988d2..d9092cad1b4 100644
--- a/src/conversions/jiff.rs
+++ b/src/conversions/jiff.rs
@@ -527,37 +527,38 @@ mod tests {
         });
     }
 
+    #[cfg(not(Py_LIMITED_API))]
     #[test]
     fn test_invalid_types_fail() {
         Python::attach(|py| {
             let none = py.None().into_bound(py);
             assert_eq!(
                 none.extract::<Span>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'timedelta'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyDelta'"
             );
             assert_eq!(
                 none.extract::<Offset>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'tzinfo'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyTzInfo'"
             );
             assert_eq!(
                 none.extract::<TimeZone>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'tzinfo'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyTzInfo'"
             );
             assert_eq!(
                 none.extract::<Time>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'time'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyTime'"
             );
             assert_eq!(
                 none.extract::<Date>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'date'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyDate'"
             );
             assert_eq!(
                 none.extract::<DateTime>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'datetime'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyDateTime'"
             );
             assert_eq!(
                 none.extract::<Zoned>().unwrap_err().to_string(),
-                "TypeError: 'NoneType' object cannot be converted to 'datetime'"
+                "TypeError: 'NoneType' object cannot be converted to 'PyDateTime'"
             );
         });
     }

From 8920db3fdd2c9f8c144ce63d73c06e789437b417 Mon Sep 17 00:00:00 2001
From: Thomas Tanon <thomas@pellissier-tanon.fr>
Date: Mon, 1 Sep 2025 17:45:23 +0200
Subject: [PATCH 4/7] Apply suggestion from @davidhewitt

Co-authored-by: David Hewitt <mail@davidhewitt.dev>
---
 src/types/code.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/code.rs b/src/types/code.rs
index 56c1fb87be9..4abc0291e43 100644
--- a/src/types/code.rs
+++ b/src/types/code.rs
@@ -16,7 +16,7 @@ pub struct PyCode(PyAny);
 pyobject_native_type_core!(
     PyCode,
     pyobject_native_static_type_object!(ffi::PyCode_Type),
-    "PyCode",
+    "code",
     #checkfunction=ffi::PyCode_Check
 );
 

From 9fb6ec0e37640108d26971330d3ba9cf79b5378e Mon Sep 17 00:00:00 2001
From: Thomas Tanon <thomas@pellissier-tanon.fr>
Date: Mon, 1 Sep 2025 17:45:34 +0200
Subject: [PATCH 5/7] Update src/types/code.rs

Co-authored-by: David Hewitt <mail@davidhewitt.dev>
---
 src/types/code.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/code.rs b/src/types/code.rs
index 4abc0291e43..4b4726f1b9a 100644
--- a/src/types/code.rs
+++ b/src/types/code.rs
@@ -25,7 +25,7 @@ pyobject_native_type_named!(PyCode);
 
 #[cfg(any(Py_LIMITED_API, PyPy))]
 impl crate::PyTypeCheck for PyCode {
-    const NAME: &'static str = "codeobject";
+    const NAME: &'static str = "code";
     #[cfg(feature = "experimental-inspect")]
     const PYTHON_TYPE: &'static str = "types.CodeType";
 

From 9bc3afc8920ba9b77e5bfdae96a88c04afa108cf Mon Sep 17 00:00:00 2001
From: Thomas Tanon <thomas@pellissier-tanon.fr>
Date: Mon, 1 Sep 2025 17:45:42 +0200
Subject: [PATCH 6/7] Update src/types/range.rs

Co-authored-by: David Hewitt <mail@davidhewitt.dev>
---
 src/types/range.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/range.rs b/src/types/range.rs
index 0823f556636..1b837e063d4 100644
--- a/src/types/range.rs
+++ b/src/types/range.rs
@@ -12,7 +12,7 @@ use crate::{ffi, Bound, PyAny, PyResult, PyTypeInfo, Python};
 #[repr(transparent)]
 pub struct PyRange(PyAny);
 
-pyobject_native_type_core!(PyRange, pyobject_native_static_type_object!(ffi::PyRange_Type), "range",#checkfunction=ffi::PyRange_Check);
+pyobject_native_type_core!(PyRange, pyobject_native_static_type_object!(ffi::PyRange_Type), "range", #checkfunction=ffi::PyRange_Check);
 
 impl<'py> PyRange {
     /// Creates a new Python `range` object with a default step of 1.

From bae30b3804b6db2f90c406f94a8429a686301104 Mon Sep 17 00:00:00 2001
From: Thomas Tanon <thomas@pellissier-tanon.fr>
Date: Mon, 1 Sep 2025 17:45:50 +0200
Subject: [PATCH 7/7] Update src/types/capsule.rs

Co-authored-by: David Hewitt <mail@davidhewitt.dev>
---
 src/types/capsule.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/capsule.rs b/src/types/capsule.rs
index baf827f6038..a6237b8615c 100644
--- a/src/types/capsule.rs
+++ b/src/types/capsule.rs
@@ -47,7 +47,7 @@ use std::ffi::{CStr, CString};
 #[repr(transparent)]
 pub struct PyCapsule(PyAny);
 
-pyobject_native_type_core!(PyCapsule, pyobject_native_static_type_object!(ffi::PyCapsule_Type), "PyCapsule", #checkfunction=ffi::PyCapsule_CheckExact);
+pyobject_native_type_core!(PyCapsule, pyobject_native_static_type_object!(ffi::PyCapsule_Type), "capsule", #checkfunction=ffi::PyCapsule_CheckExact);
 
 impl PyCapsule {
     /// Constructs a new capsule whose contents are `value`, associated with `name`.