GH-137630: Argument Clinic: Reduce use of 'as' for renaming in _interpretersmodule.c

Modules/_interpretersmodule.c

@@ -742,7 +742,7 @@
 
 
 static PyInterpreterState *
-resolve_interp(PyObject *idobj, int restricted, int reqready, const char *op)
+resolve_interp(PyObject *idobj, int restrict, int reqready, const char *op)
 {
     PyInterpreterState *interp;
     if (idobj == NULL) {
@@ -767,7 +767,7 @@
         return NULL;
     }
 
-    if (restricted && get_whence(interp) != _PyInterpreterState_WHENCE_STDLIB) {
+    if (restrict && get_whence(interp) != _PyInterpreterState_WHENCE_STDLIB) {
         if (idobj == NULL) {
             PyErr_Format(PyExc_InterpreterError,
                          "cannot %s unrecognized current interpreter", op);
@@ -907,7 +907,7 @@
 _interpreters.destroy
     id: object
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Destroy the identified interpreter.
 
@@ -916,13 +916,13 @@
 [clinic start generated code]*/
 
 static PyObject *
-_interpreters_destroy_impl(PyObject *module, PyObject *id, int restricted)
-/*[clinic end generated code: output=0bc20da8700ab4dd input=561bdd6537639d40]*/
+_interpreters_destroy_impl(PyObject *module, PyObject *id, int restrict)
+/*[clinic end generated code: output=3887e3c350597df5 input=43fd109df8e851f9]*/
 {
     // Look up the interpreter.
     int reqready = 0;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "destroy");
+            resolve_interp(id, restrict, reqready, "destroy");
     if (interp == NULL) {
         return NULL;
     }
@@ -1034,20 +1034,20 @@
     id: object
     updates: object(subclass_of='&PyDict_Type')
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Bind the given attributes in the interpreter's __main__ module.
 [clinic start generated code]*/
 
 static PyObject *
 _interpreters_set___main___attrs_impl(PyObject *module, PyObject *id,
-                                      PyObject *updates, int restricted)
-/*[clinic end generated code: output=f3803010cb452bf0 input=d16ab8d81371f86a]*/
+                                      PyObject *updates, int restrict)
+/*[clinic end generated code: output=494c8fc4be971936 input=4235567e63091172]*/
 {
     // Look up the interpreter.
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "update __main__ for");
+            resolve_interp(id, restrict, reqready, "update __main__ for");
     if (interp == NULL) {
         return NULL;
     }
@@ -1109,7 +1109,7 @@
     code: object
     shared: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Execute the provided code in the identified interpreter.
 
@@ -1129,13 +1129,13 @@
 
 static PyObject *
 _interpreters_exec_impl(PyObject *module, PyObject *id, PyObject *code,
-                        PyObject *shared, int restricted)
-/*[clinic end generated code: output=492057c4f10dc304 input=5a22c1ed0c5dbcf3]*/
+                        PyObject *shared, int restrict)
+/*[clinic end generated code: output=1e47a912017ea298 input=0591915eb37dc8ca]*/
 {
     PyThreadState *tstate = _PyThreadState_GET();
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "exec code for");
+            resolve_interp(id, restrict, reqready, "exec code for");
     if (interp == NULL) {
         return NULL;
     }
@@ -1165,7 +1165,7 @@
     script: unicode
     shared: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Execute the provided string in the identified interpreter.
 
@@ -1175,14 +1175,14 @@
 static PyObject *
 _interpreters_run_string_impl(PyObject *module, PyObject *id,
                               PyObject *script, PyObject *shared,
-                              int restricted)
-/*[clinic end generated code: output=a30a64fb9ad396a2 input=51ce549b9a8dbe21]*/
+                              int restrict)
+/*[clinic end generated code: output=aa0b7383aca83202 input=f6fb336564bfe090]*/
 {
 #define FUNCNAME MODULE_NAME_STR ".run_string"
     PyThreadState *tstate = _PyThreadState_GET();
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "run a string in");
+            resolve_interp(id, restrict, reqready, "run a string in");
     if (interp == NULL) {
         return NULL;
     }
@@ -1216,7 +1216,7 @@
     func: object
     shared: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Execute the body of the provided function in the identified interpreter.
 
@@ -1228,14 +1228,14 @@
 
 static PyObject *
 _interpreters_run_func_impl(PyObject *module, PyObject *id, PyObject *func,
-                            PyObject *shared, int restricted)
-/*[clinic end generated code: output=131f7202ca4a0c5e input=2d62bb9b9eaf4948]*/
+                            PyObject *shared, int restrict)
+/*[clinic end generated code: output=80c7ab83886e5497 input=08d2724bce5e5d8c]*/
 {
 #define FUNCNAME MODULE_NAME_STR ".run_func"
     PyThreadState *tstate = _PyThreadState_GET();
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "run a function in");
+            resolve_interp(id, restrict, reqready, "run a function in");
     if (interp == NULL) {
         return NULL;
     }
@@ -1276,11 +1276,11 @@
 _interpreters.call
     id: object
     callable: object
-    args as args_obj: object(subclass_of='&PyTuple_Type', c_default='NULL') = ()
-    kwargs as kwargs_obj: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
+    args: object(subclass_of='&PyTuple_Type', c_default='NULL') = ()
+    kwargs: object(subclass_of='&PyDict_Type', c_default='NULL') = {}
     *
     preserve_exc: bool = False
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Call the provided object in the identified interpreter.
 
@@ -1289,14 +1289,14 @@
 
 static PyObject *
 _interpreters_call_impl(PyObject *module, PyObject *id, PyObject *callable,
-                        PyObject *args_obj, PyObject *kwargs_obj,
-                        int preserve_exc, int restricted)
-/*[clinic end generated code: output=983ee27b3c43f6ef input=77590fdb3f519d65]*/
+                        PyObject *args, PyObject *kwargs, int preserve_exc,
+                        int restrict)
+/*[clinic end generated code: output=e04c697326e0f482 input=858caec5becc34ed]*/
 {
     PyThreadState *tstate = _PyThreadState_GET();
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "make a call in");
+            resolve_interp(id, restrict, reqready, "make a call in");
     if (interp == NULL) {
         return NULL;
     }
@@ -1351,18 +1351,18 @@
 _interpreters.is_running
     id: object
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Return whether or not the identified interpreter is running.
 [clinic start generated code]*/
 
 static PyObject *
-_interpreters_is_running_impl(PyObject *module, PyObject *id, int restricted)
-/*[clinic end generated code: output=32a6225d5ded9bdb input=3291578d04231125]*/
+_interpreters_is_running_impl(PyObject *module, PyObject *id, int restrict)
+/*[clinic end generated code: output=807f93da48f682cd input=ab3e5e07a870d506]*/
 {
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "check if running for");
+            resolve_interp(id, restrict, reqready, "check if running for");
     if (interp == NULL) {
         return NULL;
     }
@@ -1376,25 +1376,24 @@
 
 /*[clinic input]
 _interpreters.get_config
-    id as idobj: object
+    id: object
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 Return a representation of the config used to initialize the interpreter.
 [clinic start generated code]*/
 
 static PyObject *
-_interpreters_get_config_impl(PyObject *module, PyObject *idobj,
-                              int restricted)
-/*[clinic end generated code: output=63f81d35c2fe1387 input=aa38d50f534eb3c5]*/
+_interpreters_get_config_impl(PyObject *module, PyObject *id, int restrict)
+/*[clinic end generated code: output=b739277cc30cf365 input=d268b92b96b0712b]*/
 {
-    if (idobj == Py_None) {
-        idobj = NULL;
+    if (id == Py_None) {
+        id = NULL;
     }
 
     int reqready = 0;
     PyInterpreterState *interp = \
-            resolve_interp(idobj, restricted, reqready, "get the config of");
+            resolve_interp(id, restrict, reqready, "get the config of");
     if (interp == NULL) {
         return NULL;
     }
@@ -1440,18 +1439,18 @@
     id: object
     *
     implieslink: bool = False
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 [clinic start generated code]*/
 
 static PyObject *
 _interpreters_incref_impl(PyObject *module, PyObject *id, int implieslink,
-                          int restricted)
-/*[clinic end generated code: output=eccaa4e03fbe8ee2 input=a0a614748f2e348c]*/
+                          int restrict)
+/*[clinic end generated code: output=07ac7d417e19ea14 input=d83785796c100d14]*/
 {
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "incref");
+            resolve_interp(id, restrict, reqready, "incref");
     if (interp == NULL) {
         return NULL;
     }
@@ -1470,17 +1469,17 @@
 _interpreters.decref
     id: object
     *
-    restrict as restricted: bool = False
+    restrict: bool = False
 
 [clinic start generated code]*/
 
 static PyObject *
-_interpreters_decref_impl(PyObject *module, PyObject *id, int restricted)
-/*[clinic end generated code: output=5c54db4b22086171 input=c4aa34f09c44e62a]*/
+_interpreters_decref_impl(PyObject *module, PyObject *id, int restrict)
+/*[clinic end generated code: output=1b9b5a4b9f16b914 input=3eb5e65dffddffe3]*/
 {
     int reqready = 1;
     PyInterpreterState *interp = \
-            resolve_interp(id, restricted, reqready, "decref");
+            resolve_interp(id, restrict, reqready, "decref");
     if (interp == NULL) {
         return NULL;
     }