https://github.com/python/cpython/commit/c520bf9bdf77d43c3d5d95bd08e856759a2abc86
commit: c520bf9bdf77d43c3d5d95bd08e856759a2abc86
branch: main
author: neonene <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-04-16T09:52:45Z
summary:
gh-117613: Argument Clinic: ensure that 'defining_class' params are
positional-only (#117781)
files:
M Lib/test/test_clinic.py
M Modules/_sqlite/clinic/connection.c.h
M Modules/clinic/_testclinic.c.h
M Tools/clinic/libclinic/dsl_parser.py
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
index ef57aaca9597bf..43b629f59f0346 100644
--- a/Lib/test/test_clinic.py
+++ b/Lib/test/test_clinic.py
@@ -2508,6 +2508,16 @@ def
test_state_func_docstring_only_one_param_template(self):
"""
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 811314b5cd8aed..bb0a0278c629d4 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 @@ getconfig(pysqlite_Connection *self, PyObject *arg)
#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 d1e09c94f05197..6a59baa2137b75 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 9e22d847c4dc90..56c6dca3db3d1d 100644
--- a/Tools/clinic/libclinic/dsl_parser.py
+++ b/Tools/clinic/libclinic/dsl_parser.py
@@ -1102,6 +1102,7 @@ def bad_node(self, node: ast.AST) -> None:
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 "
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
