diff options
| author | neonene <53406459+neonene@users.noreply.github.com> | 2024-04-16 09:52:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 09:52:45 (GMT) |
| commit | c520bf9bdf77d43c3d5d95bd08e856759a2abc86 (patch) | |
| tree | 9b488b1b76dd1320ddcd9597c7e8620659c45161 | |
| parent | 1316692e8c7c1e1f3b6639e51804f9db5ed892ea (diff) | |
| download | cpython-c520bf9bdf77d43c3d5d95bd08e856759a2abc86.zip cpython-c520bf9bdf77d43c3d5d95bd08e856759a2abc86.tar.gz cpython-c520bf9bdf77d43c3d5d95bd08e856759a2abc86.tar.bz2 | |
gh-117613: Argument Clinic: ensure that 'defining_class' params are positional-only (#117781)
| -rw-r--r-- | Lib/test/test_clinic.py | 10 | ||||
| -rw-r--r-- | Modules/_sqlite/clinic/connection.c.h | 8 | ||||
| -rw-r--r-- | Modules/clinic/_testclinic.c.h | 4 | ||||
| -rw-r--r-- | Tools/clinic/libclinic/dsl_parser.py | 1 |
4 files changed, 17 insertions, 6 deletions
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py index ef57aac..43b629f 100644 --- a/Lib/test/test_clinic.py +++ b/Lib/test/test_clinic.py @@ -2508,6 +2508,16 @@ class ClinicParserTest(TestCase): """ self.expect_failure(block, err, lineno=7) + def test_kind_defining_class(self): + function = self.parse_function(""" + module m + class m.C "PyObject *" "" + m.C.meth + cls: defining_class + """, signatures_in_block=3, function_index=2) + p = function.parameters['cls'] + self.assertEqual(p.kind, inspect.Parameter.POSITIONAL_ONLY) + class ClinicExternalTest(TestCase): maxDiff = None diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h index 811314b..bb0a027 100644 --- a/Modules/_sqlite/clinic/connection.c.h +++ b/Modules/_sqlite/clinic/connection.c.h @@ -744,7 +744,7 @@ pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls, PyObject *return_value = NULL; #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - #define NUM_KEYWORDS 2 + #define NUM_KEYWORDS 1 static struct { PyGC_Head _this_is_not_used; PyObject_VAR_HEAD @@ -837,7 +837,7 @@ pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject PyObject *return_value = NULL; #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - #define NUM_KEYWORDS 3 + #define NUM_KEYWORDS 2 static struct { PyGC_Head _this_is_not_used; PyObject_VAR_HEAD @@ -925,7 +925,7 @@ pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject * PyObject *return_value = NULL; #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - #define NUM_KEYWORDS 2 + #define NUM_KEYWORDS 1 static struct { PyGC_Head _this_is_not_used; PyObject_VAR_HEAD @@ -1866,4 +1866,4 @@ exit: #ifndef DESERIALIZE_METHODDEF #define DESERIALIZE_METHODDEF #endif /* !defined(DESERIALIZE_METHODDEF) */ -/*[clinic end generated code: output=3c6d0b748fac016f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7d41a178b7b2b683 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index d1e09c9..6a59baa 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -3183,7 +3183,7 @@ _testclinic_TestClass_get_defining_class_arg(PyObject *self, PyTypeObject *cls, PyObject *return_value = NULL; #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - #define NUM_KEYWORDS 2 + #define NUM_KEYWORDS 1 static struct { PyGC_Head _this_is_not_used; PyObject_VAR_HEAD @@ -3219,4 +3219,4 @@ _testclinic_TestClass_get_defining_class_arg(PyObject *self, PyTypeObject *cls, exit: return return_value; } -/*[clinic end generated code: output=71b2a15aa86c2bcf input=a9049054013a1b77]*/ +/*[clinic end generated code: output=aa352c3a67300056 input=a9049054013a1b77]*/ diff --git a/Tools/clinic/libclinic/dsl_parser.py b/Tools/clinic/libclinic/dsl_parser.py index 9e22d84..56c6dca 100644 --- a/Tools/clinic/libclinic/dsl_parser.py +++ b/Tools/clinic/libclinic/dsl_parser.py @@ -1102,6 +1102,7 @@ class DSLParser: fail("A 'defining_class' parameter cannot have a default value.") if self.group: fail("A 'defining_class' parameter cannot be in an optional group.") + kind = inspect.Parameter.POSITIONAL_ONLY else: fail("A 'defining_class' parameter, if specified, must either " "be the first thing in the parameter block, or come just " |