Skip to content

Commit 26db3ea

Browse files
committed
gh-110964: clinic: pass clinic argument to bad_argument()
Don't rely on the global 'clinic' argument: pass explicitly a 'clinic' argument.
1 parent cb1bf89 commit 26db3ea

File tree

9 files changed

+157
-88
lines changed

9 files changed

+157
-88
lines changed

Modules/_multiprocessing/multiprocessing.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class HANDLE_converter(CConverter):
1414
type = "HANDLE"
1515
format_unit = '"F_HANDLE"'
1616
17-
def parse_arg(self, argname, displayname, *, limited_capi):
17+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
1818
return self.format_code("""
1919
{paramname} = PyLong_AsVoidPtr({argname});
2020
if (!{paramname} && PyErr_Occurred()) {{{{
@@ -24,7 +24,7 @@ class HANDLE_converter(CConverter):
2424
argname=argname)
2525
2626
[python start generated code]*/
27-
/*[python end generated code: output=da39a3ee5e6b4b0d input=3cf0318efc6a8772]*/
27+
/*[python end generated code: output=da39a3ee5e6b4b0d input=256fe1883e186bbe]*/
2828

2929
/*[clinic input]
3030
module _multiprocessing

Modules/_posixsubprocess.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class pid_t_converter(CConverter):
8787
type = 'pid_t'
8888
format_unit = '" _Py_PARSE_PID "'
8989
90-
def parse_arg(self, argname, displayname, *, limited_capi):
90+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
9191
return self.format_code("""
9292
{paramname} = PyLong_AsPid({argname});
9393
if ({paramname} == -1 && PyErr_Occurred()) {{{{
@@ -96,7 +96,7 @@ class pid_t_converter(CConverter):
9696
""",
9797
argname=argname)
9898
[python start generated code]*/
99-
/*[python end generated code: output=da39a3ee5e6b4b0d input=c94349aa1aad151d]*/
99+
/*[python end generated code: output=da39a3ee5e6b4b0d input=b582c628f43ebe2a]*/
100100

101101
#include "clinic/_posixsubprocess.c.h"
102102

Modules/_struct.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class cache_struct_converter(CConverter):
109109
c_default = "NULL"
110110
broken_limited_capi = True
111111
112-
def parse_arg(self, argname, displayname, *, limited_capi):
112+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
113113
assert not limited_capi
114114
return self.format_code("""
115115
if (!{converter}(module, {argname}, &{paramname})) {{{{
@@ -122,7 +122,7 @@ class cache_struct_converter(CConverter):
122122
def cleanup(self):
123123
return "Py_XDECREF(%s);\n" % self.name
124124
[python start generated code]*/
125-
/*[python end generated code: output=da39a3ee5e6b4b0d input=c33b27d6b06006c6]*/
125+
/*[python end generated code: output=da39a3ee5e6b4b0d input=06483ea83abe39fb]*/
126126

127127
static int cache_struct_converter(PyObject *, PyObject *, PyStructObject **);
128128

Modules/overlapped.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
class pointer_converter(CConverter):
3939
format_unit = '"F_POINTER"'
4040
41-
def parse_arg(self, argname, displayname, *, limited_capi):
41+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
4242
return self.format_code("""
4343
{paramname} = PyLong_AsVoidPtr({argname});
4444
if (!{paramname} && PyErr_Occurred()) {{{{
@@ -56,7 +56,7 @@ class HANDLE_converter(pointer_converter):
5656
class ULONG_PTR_converter(pointer_converter):
5757
type = 'ULONG_PTR'
5858
59-
def parse_arg(self, argname, displayname, *, limited_capi):
59+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
6060
return self.format_code("""
6161
{paramname} = (uintptr_t)PyLong_AsVoidPtr({argname});
6262
if (!{paramname} && PyErr_Occurred()) {{{{
@@ -71,7 +71,7 @@ class DWORD_converter(unsigned_long_converter):
7171
class BOOL_converter(int_converter):
7272
type = 'BOOL'
7373
[python start generated code]*/
74-
/*[python end generated code: output=da39a3ee5e6b4b0d input=436f4440630a304c]*/
74+
/*[python end generated code: output=da39a3ee5e6b4b0d input=422287c842b7eba8]*/
7575

7676
/*[clinic input]
7777
module _overlapped

Modules/resource.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class pid_t_converter(CConverter):
2626
type = 'pid_t'
2727
format_unit = '" _Py_PARSE_PID "'
2828
29-
def parse_arg(self, argname, displayname, *, limited_capi):
29+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
3030
return self.format_code("""
3131
{paramname} = PyLong_AsPid({argname});
3232
if ({paramname} == -1 && PyErr_Occurred()) {{{{
@@ -35,7 +35,7 @@ class pid_t_converter(CConverter):
3535
""",
3636
argname=argname)
3737
[python start generated code]*/
38-
/*[python end generated code: output=da39a3ee5e6b4b0d input=c94349aa1aad151d]*/
38+
/*[python end generated code: output=da39a3ee5e6b4b0d input=b582c628f43ebe2a]*/
3939

4040
#include "clinic/resource.c.h"
4141

PC/_testconsole.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class HANDLE_converter(CConverter):
4040
type = 'void *'
4141
format_unit = '"_Py_PARSE_UINTPTR"'
4242
43-
def parse_arg(self, argname, displayname, *, limited_capi):
43+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
4444
return self.format_code("""
4545
{paramname} = PyLong_AsVoidPtr({argname});
4646
if (!{paramname} && PyErr_Occurred()) {{{{
@@ -49,7 +49,7 @@ class HANDLE_converter(CConverter):
4949
""",
5050
argname=argname)
5151
[python start generated code]*/
52-
/*[python end generated code: output=da39a3ee5e6b4b0d input=380aa5c91076742b]*/
52+
/*[python end generated code: output=da39a3ee5e6b4b0d input=6519570cd567ce54]*/
5353
/*[python end generated code:]*/
5454

5555
/*[clinic input]

PC/msvcrtmodule.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class HANDLE_converter(CConverter):
3838
type = 'void *'
3939
format_unit = '"_Py_PARSE_UINTPTR"'
4040
41-
def parse_arg(self, argname, displayname, *, limited_capi):
41+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
4242
return self.format_code("""
4343
{paramname} = PyLong_AsVoidPtr({argname});
4444
if (!{paramname} && PyErr_Occurred()) {{{{
@@ -75,7 +75,7 @@ class wchar_t_return_converter(CReturnConverter):
7575
data.return_conversion.append(
7676
'return_value = PyUnicode_FromOrdinal(_return_value);\n')
7777
[python start generated code]*/
78-
/*[python end generated code: output=da39a3ee5e6b4b0d input=ff031be44ab3250d]*/
78+
/*[python end generated code: output=da39a3ee5e6b4b0d input=6cfb201e0745c7f7]*/
7979

8080
/*[clinic input]
8181
module msvcrt

PC/winreg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class HKEY_converter(CConverter):
222222
converter = 'clinic_HKEY_converter'
223223
broken_limited_capi = True
224224
225-
def parse_arg(self, argname, displayname, *, limited_capi):
225+
def parse_arg(self, argname, displayname, *, clinic, limited_capi):
226226
assert not limited_capi
227227
return self.format_code("""
228228
if (!{converter}(_PyModule_GetState(module), {argname}, &{paramname})) {{{{
@@ -252,7 +252,7 @@ class self_return_converter(CReturnConverter):
252252
data.return_conversion.append(
253253
'return_value = (PyObject *)_return_value;\n')
254254
[python start generated code]*/
255-
/*[python end generated code: output=da39a3ee5e6b4b0d input=4979f33998ffb6f8]*/
255+
/*[python end generated code: output=da39a3ee5e6b4b0d input=5d9a391867dbe35a]*/
256256

257257
#include "clinic/winreg.c.h"
258258

0 commit comments

Comments
 (0)