fix whitespace issue, cast list to tuple for types.GenericAlias

Fidget-Spinner · Fidget-Spinner · commit 3e67f23b58ec · 2020-12-16T00:01:58.000+08:00
diff --git a/Lib/typing.py b/Lib/typing.py
@@ -1161,7 +1161,7 @@ def __class_getitem__(cls, params):
             # Subscripting a regular Generic subclass.
 
             if any(isinstance(t, ParamSpec) for t in cls.__parameters__):
-               params = _prepare_paramspec_params(cls, params)
+                params = _prepare_paramspec_params(cls, params)
             _check_generic(cls, params, len(cls.__parameters__))
         return _GenericAlias(cls, params)
 
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
@@ -280,7 +280,14 @@ subs_tvars(PyObject *obj, PyObject *params, PyObject **argitems)
             if (iparam >= 0) {
                 arg = argitems[iparam];
             }
-            Py_INCREF(arg);
+            // convert all the lists inside args to tuples to help
+            // with caching in other libaries
+            if (PyList_CheckExact(arg)) {
+                arg = PyList_AsTuple(arg);
+            }
+            else {
+                Py_INCREF(arg);
+            }
             PyTuple_SET_ITEM(subargs, i, arg);
         }
 
@@ -576,15 +583,29 @@ setup_ga(gaobject *alias, PyObject *origin, PyObject *args) {
             return 0;
         }
     }
-    else {
-        Py_INCREF(args);
+    Py_ssize_t argslen = PyTuple_GET_SIZE(args);
+    PyObject *_args = PyList_New(argslen);
+    if (_args == NULL) {
+        return 0;
+    }
+    // convert all the lists inside args to tuples to help
+    // with caching in other libaries
+    for (Py_ssize_t i = 0; i < argslen; ++i) {
+        PyObject *p = PyTuple_GET_ITEM(args, i);
+        if (PyList_CheckExact(p)) {
+            p = PyList_AsTuple(p);
+        }
+        PyList_SET_ITEM(_args, i, p);
     }
+    args = PyList_AsTuple(_args);
+    PyObject_GC_Del(_args);
 
     Py_INCREF(origin);
     alias->origin = origin;
     alias->args = args;
     alias->parameters = NULL;
     alias->weakreflist = NULL;
+
     return 1;
 }
 
