gh-114258: Use Argument Clinic for __repr__

Modules/mmapmodule.c

@@ -1256,8 +1256,16 @@ mmap_mmap___exit___impl(mmap_object *self, PyObject *exc_type,
     return mmap_mmap_close_impl(self);
 }
 
+/*[clinic input]
+@critical_section
+mmap.mmap.__repr__ as mmap__repr__method
+
+    op: self(type="PyObject *")
+[clinic start generated code]*/
+
 static PyObject *
-mmap__repr__method_lock_held(PyObject *op)
+mmap__repr__method_impl(PyObject *op)
+/*[clinic end generated code: output=c896c8c4cd07228c input=a030361fbcfe851a]*/
 {
     mmap_object *mobj = mmap_object_CAST(op);
 
@@ -1301,16 +1309,6 @@ mmap__repr__method_lock_held(PyObject *op)
     }
 }
 
-static PyObject *
-mmap__repr__method(PyObject *op)
-{
-    PyObject *result;
-    Py_BEGIN_CRITICAL_SECTION(op);
-    result = mmap__repr__method_lock_held(op);
-    Py_END_CRITICAL_SECTION();
-    return result;
-}
-
 #ifdef MS_WINDOWS
 /*[clinic input]
 @critical_section

Objects/bytearrayobject.c

@@ -1182,8 +1182,16 @@ bytearray___init___impl(PyByteArrayObject *self, PyObject *arg,
     return -1;
 }
 
+/*[clinic input]
+@critical_section
+bytearray.__repr__
+
+    op: self(type="PyObject *")
+[clinic start generated code]*/
+
 static PyObject *
-bytearray_repr_lock_held(PyObject *op)
+bytearray_repr_impl(PyObject *op)
+/*[clinic end generated code: output=4086ab6928ebab1d input=d46ad3c1f3071b27]*/
 {
     _Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(op);
     const char *className = _PyType_Name(Py_TYPE(op));
@@ -1198,16 +1206,6 @@ bytearray_repr_lock_held(PyObject *op)
     return res;
 }
 
-static PyObject *
-bytearray_repr(PyObject *op)
-{
-    PyObject *ret;
-    Py_BEGIN_CRITICAL_SECTION(op);
-    ret = bytearray_repr_lock_held(op);
-    Py_END_CRITICAL_SECTION();
-    return ret;
-}
-
 static PyObject *
 bytearray_str(PyObject *op)
 {

Objects/dictobject.c

@@ -3772,23 +3772,21 @@ anydict_repr_impl(PyObject *self)
     return NULL;
 }
 
+/*[clinic input]
+@critical_section
+dict.__repr__
+
+    self: self(type="PyObject *")
+[clinic start generated code]*/
+
 static PyObject *
-dict_repr_lock_held(PyObject *self)
+dict_repr_impl(PyObject *self)
+/*[clinic end generated code: output=059263af818a321d input=f9c423cbdf534674]*/
 {
     ASSERT_DICT_LOCKED((PyDictObject *)self);
     return anydict_repr_impl(self);
 }
 
-static PyObject *
-dict_repr(PyObject *self)
-{
-    PyObject *res;
-    Py_BEGIN_CRITICAL_SECTION(self);
-    res = dict_repr_lock_held(self);
-    Py_END_CRITICAL_SECTION();
-    return res;
-}
-
 static Py_ssize_t
 dict_length(PyObject *self)
 {

Objects/listobject.c

@@ -632,9 +632,21 @@ list_dealloc(PyObject *self)
     }
 }
 
+/*[clinic input]
+@critical_section
+list.__repr__
+
+    v: self(type="PyListObject *")
+[clinic start generated code]*/
+
 static PyObject *
 list_repr_impl(PyListObject *v)
+/*[clinic end generated code: output=c5ffe3b9cfee36ce input=f4b85c550d11de32]*/
 {
+    if (PyList_GET_SIZE(v) == 0) {
+        return PyUnicode_FromString("[]");
+    }
+
     int res = Py_ReprEnter((PyObject*)v);
     if (res != 0) {
         return (res > 0 ? PyUnicode_FromString("[...]") : NULL);
@@ -687,20 +699,6 @@ list_repr_impl(PyListObject *v)
     return NULL;
 }
 
-static PyObject *
-list_repr(PyObject *self)
-{
-    if (PyList_GET_SIZE(self) == 0) {
-        return PyUnicode_FromString("[]");
-    }
-    PyListObject *v = (PyListObject *)self;
-    PyObject *ret = NULL;
-    Py_BEGIN_CRITICAL_SECTION(v);
-    ret = list_repr_impl(v);
-    Py_END_CRITICAL_SECTION();
-    return ret;
-}
-
 static Py_ssize_t
 list_length(PyObject *a)
 {

Objects/setobject.c

@@ -753,8 +753,16 @@ set_dealloc(PyObject *self)
     Py_TYPE(so)->tp_free(so);
 }
 
+/*[clinic input]
+@critical_section
+set.__repr__
+
+    so: setobject
+[clinic start generated code]*/
+
 static PyObject *
-set_repr_lock_held(PySetObject *so)
+set_repr_impl(PySetObject *so)
+/*[clinic end generated code: output=5dfbb5e7f7c947ad input=f6743ec76163d7b3]*/
 {
     PyObject *result=NULL, *keys, *listrepr, *tmp;
     int status = Py_ReprEnter((PyObject*)so);
@@ -807,17 +815,6 @@ set_repr_lock_held(PySetObject *so)
     return result;
 }
 
-static PyObject *
-set_repr(PyObject *self)
-{
-    PySetObject *so = _PySet_CAST(self);
-    PyObject *result;
-    Py_BEGIN_CRITICAL_SECTION(so);
-    result = set_repr_lock_held(so);
-    Py_END_CRITICAL_SECTION();
-    return result;
-}
-
 static Py_ssize_t
 set_len(PyObject *self)
 {

Tools/clinic/libclinic/dsl_parser.py

@@ -85,7 +85,6 @@
 __radd__
 __rand__
 __rdivmod__
-__repr__
 __rfloordiv__
 __rlshift__
 __rmatmul__
@@ -920,10 +919,6 @@ def state_parameters_start(self, line: str) -> None:
         assert self.function is not None
         if self.function.kind is GETTER:
             fail("@getter methods cannot define parameters")
-        if self.function.kind is SLOT:
-            assert self.function.slot is not None
-            if not self.function.slot.takes_parameters:
-                fail(f"{self.function.name!r} methods cannot define parameters")
 
         self.parameter_continuation = ''
         return self.next(self.state_parameter, line)
@@ -1680,6 +1675,8 @@ def check_slot_parameters(self, func: Function) -> None:
         """Check that the parameters of a slot method select a C slot."""
         assert func.slot is not None
         params = list(func.parameters.values())[1:]
+        if params and not func.slot.takes_parameters:
+            fail(f"{func.name!r} methods cannot define parameters")
         for p in params:
             if not p.is_positional_only():
                 fail(f"The parameters of {func.name!r} must be positional-only")

Tools/clinic/libclinic/slots.py

@@ -56,4 +56,7 @@ def describe_signatures(self) -> str:
     '__next__': SlotSpec('__next__', 'PyObject *', 'object', {
         (): 'tp_iternext',
     }),
+    '__repr__': SlotSpec('__repr__', 'PyObject *', 'object', {
+        (): 'tp_repr',
+    }),
 }