gh-140382: Add support for __getattr__ method to Argument Clinic

Lib/test/test_clinic.py

@@ -2586,6 +2586,25 @@ class T "" ""
         """
         self.expect_failure(block, err, lineno=1)
 
+    def test_can_convert_module_getattr(self):
+        function = self.parse_function("""
+            module m
+            __getattr__
+                name: object
+                /
+        """)
+        self.assertEqual(function.kind, FunctionKind.METHOD_GETATTR)
+
+    def test_can_convert_class_getattr(self):
+        function = self.parse_function("""
+            module m
+            class m.T "PyObject *" ""
+            m.T.__getattr__
+                name: object
+                /
+        """, signatures_in_block=3, function_index=2)
+        self.assertEqual(function.kind, FunctionKind.METHOD_GETATTR)
+
     def test_cannot_specify_pydefault_without_default(self):
         err = "You can't specify py_default without specifying a default value!"
         block = """

Misc/NEWS.d/next/Tools-Demos/2025-10-20-16-49-22.gh-issue-140382.lzLQCh.rst

@@ -0,0 +1 @@
+Argument clinic now supports :meth:`module.__getattr__`.

Modules/zlibmodule.c

@@ -2015,15 +2015,20 @@ zlib_crc32_combine_impl(PyObject *module, unsigned int crc1,
     return crc32_combine(crc1, crc2, len);
 }
 
+/*[clinic input]
+zlib.__getattr__
+
+    name: str
+    /
+
+Module __getattr__
+[clinic start generated code]*/
+
 static PyObject *
-zlib_getattr(PyObject *self, PyObject *args)
+zlib___getattr___impl(PyObject *module, const char *name)
+/*[clinic end generated code: output=5ec48f62426a4b95 input=59a69e9dcff70564]*/
 {
-    PyObject *name;
-    if (!PyArg_UnpackTuple(args, "__getattr__", 1, 1, &name)) {
-        return NULL;
-    }
-
-    if (PyUnicode_Check(name) && PyUnicode_EqualToUTF8(name, "__version__")) {
+    if (strcmp(name, "__version__") == 0) {
         if (PyErr_WarnEx(PyExc_DeprecationWarning,
                          "'__version__' is deprecated and slated for removal in Python 3.20",
                          1) < 0) {
@@ -2032,7 +2037,7 @@ zlib_getattr(PyObject *self, PyObject *args)
         return PyUnicode_FromString("1.0");
     }
 
-    PyErr_Format(PyExc_AttributeError, "module 'zlib' has no attribute %R", name);
+    PyErr_Format(PyExc_AttributeError, "module 'zlib' has no attribute %s", name);
     return NULL;
 }
 
@@ -2046,7 +2051,7 @@ static PyMethodDef zlib_methods[] =
     ZLIB_CRC32_COMBINE_METHODDEF
     ZLIB_DECOMPRESS_METHODDEF
     ZLIB_DECOMPRESSOBJ_METHODDEF
-    {"__getattr__", zlib_getattr, METH_VARARGS, "Module __getattr__"},
+    ZLIB___GETATTR___METHODDEF
     {NULL, NULL}
 };
 

Tools/clinic/libclinic/converters.py

@@ -7,7 +7,7 @@
 from libclinic import fail, Null, unspecified, unknown
 from libclinic.function import (
     Function, Parameter,
-    CALLABLE, STATIC_METHOD, CLASS_METHOD, METHOD_INIT, METHOD_NEW,
+    CALLABLE, STATIC_METHOD, CLASS_METHOD, METHOD_INIT, METHOD_NEW, METHOD_GETATTR,
     GETTER, SETTER)
 from libclinic.codegen import CRenderData, TemplateDict
 from libclinic.converter import (
@@ -1090,7 +1090,7 @@ def correct_name_for_self(
         f: Function,
         parser: bool = False
 ) -> tuple[str, str]:
-    if f.kind in {CALLABLE, METHOD_INIT, GETTER, SETTER}:
+    if f.kind in {CALLABLE, METHOD_INIT, METHOD_GETATTR, GETTER, SETTER}:
         if f.cls:
             return "PyObject *", "self"
         return "PyObject *", "module"

Tools/clinic/libclinic/dsl_parser.py

@@ -17,7 +17,7 @@
 from libclinic.function import (
     Module, Class, Function, Parameter,
     FunctionKind,
-    CALLABLE, STATIC_METHOD, CLASS_METHOD, METHOD_INIT, METHOD_NEW,
+    CALLABLE, STATIC_METHOD, CLASS_METHOD, METHOD_INIT, METHOD_NEW, METHOD_GETATTR,
     GETTER, SETTER)
 from libclinic.converter import (
     converters, legacy_converters)
@@ -45,7 +45,6 @@
 __float__
 __floordiv__
 __ge__
-__getattr__
 __getattribute__
 __getitem__
 __gt__
@@ -598,6 +597,8 @@ def normalize_function_kind(self, fullname: str) -> None:
             self.kind = METHOD_NEW
         elif name == '__init__':
             self.kind = METHOD_INIT
+        elif name == '__getattr__':
+            self.kind = METHOD_GETATTR
 
     def resolve_return_converter(
         self, full_name: str, forced_converter: str
@@ -1533,7 +1534,7 @@ def format_docstring(self) -> str:
         assert self.function is not None
         f = self.function
         # For the following special cases, it does not make sense to render a docstring.
-        if f.kind in {METHOD_INIT, METHOD_NEW, GETTER, SETTER} and not f.docstring:
+        if f.kind in {METHOD_INIT, METHOD_NEW, METHOD_GETATTR, GETTER, SETTER} and not f.docstring:
             return f.docstring
 
         # Enforce the summary line!

Tools/clinic/libclinic/function.py

@@ -58,6 +58,7 @@ class FunctionKind(enum.Enum):
     CLASS_METHOD    = enum.auto()
     METHOD_INIT     = enum.auto()
     METHOD_NEW      = enum.auto()
+    METHOD_GETATTR  = enum.auto()
     GETTER          = enum.auto()
     SETTER          = enum.auto()
 
@@ -74,6 +75,7 @@ def __repr__(self) -> str:
 CLASS_METHOD: Final = FunctionKind.CLASS_METHOD
 METHOD_INIT: Final = FunctionKind.METHOD_INIT
 METHOD_NEW: Final = FunctionKind.METHOD_NEW
+METHOD_GETATTR: Final = FunctionKind.METHOD_GETATTR
 GETTER: Final = FunctionKind.GETTER
 SETTER: Final = FunctionKind.SETTER
 
@@ -161,7 +163,7 @@ def methoddef_flags(self) -> str | None:
             case FunctionKind.STATIC_METHOD:
                 flags.append('METH_STATIC')
             case _ as kind:
-                acceptable_kinds = {FunctionKind.CALLABLE, FunctionKind.GETTER, FunctionKind.SETTER}
+                acceptable_kinds = {FunctionKind.CALLABLE, FunctionKind.GETTER, FunctionKind.SETTER, FunctionKind.METHOD_GETATTR}
                 assert kind in acceptable_kinds, f"unknown kind: {kind!r}"
         if self.coexist:
             flags.append('METH_COEXIST')