Skip to content

Commit 60e8d44

Browse files
committed
Merge branch 'master' into ac-decimal/73487
2 parents 21472b0 + 797c2c3 commit 60e8d44

File tree

3 files changed

+25
-26
lines changed

3 files changed

+25
-26
lines changed

.github/workflows/mypy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- "Lib/test/libregrtest/**"
1414
- "Lib/tomllib/**"
1515
- "Misc/mypy/**"
16+
- "Tools/build/mypy.ini"
1617
- "Tools/build/check_extension_modules.py"
1718
- "Tools/build/compute-changes.py"
1819
- "Tools/build/deepfreeze.py"

Modules/_interpretersmodule.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,8 +1276,8 @@ _interpreters_run_func_impl(PyObject *module, PyObject *id, PyObject *func,
12761276
_interpreters.call
12771277
id: object
12781278
callable: object
1279-
args as args_obj: object(subclass_of='&PyTuple_Type', c_default='NULL') = ()
1280-
kwargs as kwargs_obj: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
1279+
args: object(subclass_of='&PyTuple_Type', c_default='NULL') = ()
1280+
kwargs: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
12811281
*
12821282
preserve_exc: bool = False
12831283
restrict as restricted: bool = False
@@ -1289,9 +1289,9 @@ Pass the given args and kwargs, if possible.
12891289

12901290
static PyObject *
12911291
_interpreters_call_impl(PyObject *module, PyObject *id, PyObject *callable,
1292-
PyObject *args_obj, PyObject *kwargs_obj,
1293-
int preserve_exc, int restricted)
1294-
/*[clinic end generated code: output=983ee27b3c43f6ef input=77590fdb3f519d65]*/
1292+
PyObject *args, PyObject *kwargs, int preserve_exc,
1293+
int restricted)
1294+
/*[clinic end generated code: output=b7a4a27d72df3ebc input=b026d0b212a575e6]*/
12951295
{
12961296
PyThreadState *tstate = _PyThreadState_GET();
12971297
int reqready = 1;
@@ -1302,7 +1302,7 @@ _interpreters_call_impl(PyObject *module, PyObject *id, PyObject *callable,
13021302
}
13031303

13041304
struct interp_call call = {0};
1305-
if (_interp_call_pack(tstate, &call, callable, args_obj, kwargs_obj) < 0) {
1305+
if (_interp_call_pack(tstate, &call, callable, args, kwargs) < 0) {
13061306
return NULL;
13071307
}
13081308

@@ -1376,25 +1376,24 @@ _interpreters_is_running_impl(PyObject *module, PyObject *id, int restricted)
13761376

13771377
/*[clinic input]
13781378
_interpreters.get_config
1379-
id as idobj: object
1379+
id: object
13801380
*
13811381
restrict as restricted: bool = False
13821382
13831383
Return a representation of the config used to initialize the interpreter.
13841384
[clinic start generated code]*/
13851385

13861386
static PyObject *
1387-
_interpreters_get_config_impl(PyObject *module, PyObject *idobj,
1388-
int restricted)
1389-
/*[clinic end generated code: output=63f81d35c2fe1387 input=aa38d50f534eb3c5]*/
1387+
_interpreters_get_config_impl(PyObject *module, PyObject *id, int restricted)
1388+
/*[clinic end generated code: output=56773353b9b7224a input=59519a01c22d96d1]*/
13901389
{
1391-
if (idobj == Py_None) {
1392-
idobj = NULL;
1390+
if (id == Py_None) {
1391+
id = NULL;
13931392
}
13941393

13951394
int reqready = 0;
13961395
PyInterpreterState *interp = \
1397-
resolve_interp(idobj, restricted, reqready, "get the config of");
1396+
resolve_interp(id, restricted, reqready, "get the config of");
13981397
if (interp == NULL) {
13991398
return NULL;
14001399
}

Modules/clinic/_interpretersmodule.c.h

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)