From 5ccb893972b921605472dafeffcce6712e5aee94 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Thu, 27 Apr 2023 07:06:35 -0700
Subject: [PATCH] Change `type_caster<PyObject>::name` to `object`, as
 suggested by @Skylion007

---
 include/pybind11/type_caster_pyobject_ptr.h | 2 +-
 tests/test_type_caster_pyobject_ptr.cpp     | 2 ++
 tests/test_type_caster_pyobject_ptr.py      | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/pybind11/type_caster_pyobject_ptr.h b/include/pybind11/type_caster_pyobject_ptr.h
index 3b6a7bed75..aa914f9e15 100644
--- a/include/pybind11/type_caster_pyobject_ptr.h
+++ b/include/pybind11/type_caster_pyobject_ptr.h
@@ -13,7 +13,7 @@ PYBIND11_NAMESPACE_BEGIN(detail)
 template <>
 class type_caster<PyObject> {
 public:
-    static constexpr auto name = const_name("PyObject *");
+    static constexpr auto name = const_name("object"); // See discussion under PR #4601.
 
     // This overload is purely to guard against accidents.
     template <typename T,
diff --git a/tests/test_type_caster_pyobject_ptr.cpp b/tests/test_type_caster_pyobject_ptr.cpp
index 6135ded40e..c6d5965c07 100644
--- a/tests/test_type_caster_pyobject_ptr.cpp
+++ b/tests/test_type_caster_pyobject_ptr.cpp
@@ -98,6 +98,8 @@ TEST_SUBMODULE(type_caster_pyobject_ptr, m) {
         return i;
     });
 
+    m.def("pass_pyobject_ptr_and_int", [](PyObject *, int) {});
+
 #ifdef PYBIND11_NO_COMPILE_SECTION // Change to ifndef for manual testing.
     {
         PyObject *ptr = nullptr;
diff --git a/tests/test_type_caster_pyobject_ptr.py b/tests/test_type_caster_pyobject_ptr.py
index fcb084a575..93e734bd07 100644
--- a/tests/test_type_caster_pyobject_ptr.py
+++ b/tests/test_type_caster_pyobject_ptr.py
@@ -89,3 +89,8 @@ def test_return_list_pyobject_ptr_reference():
     # Insert `while True:` as the first line of this function and monitor the
     # process RES (Resident Memory Size) with the Unix top command.
     assert m.dec_ref_each_pyobject_ptr(vec_obj) == 2
+
+
+def test_type_caster_name_via_incompatible_function_arguments_type_error():
+    with pytest.raises(TypeError, match=r"1\. \(arg0: object, arg1: int\) -> None"):
+        m.pass_pyobject_ptr_and_int(ValueHolder(101), ValueHolder(202))