pythongh-91162: Fix substitution of unpacked tuples in generic aliases (

pythonGH-92335) (cherry picked from commit 9d25db9) Co-authored-by: Serhiy Storchaka <[email protected]>
miss-islington · May 31, 2022 · 0b78801 · 0b78801
1 parent b425d88
commit 0b78801
Show file tree

Hide file tree

Showing 5 changed files with 211 additions and 145 deletions.
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -201,8 +201,9 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__subclasshook__)
         STRUCT_FOR_ID(__truediv__)
         STRUCT_FOR_ID(__trunc__)
+        STRUCT_FOR_ID(__typing_is_unpacked_typevartuple__)
         STRUCT_FOR_ID(__typing_subst__)
-        STRUCT_FOR_ID(__typing_unpacked__)
+        STRUCT_FOR_ID(__typing_unpacked_tuple_args__)
         STRUCT_FOR_ID(__warningregistry__)
         STRUCT_FOR_ID(__weakref__)
         STRUCT_FOR_ID(__xor__)

diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
@@ -824,8 +824,9 @@ extern "C" {
                 INIT_ID(__subclasshook__), \
                 INIT_ID(__truediv__), \
                 INIT_ID(__trunc__), \
+                INIT_ID(__typing_is_unpacked_typevartuple__), \
                 INIT_ID(__typing_subst__), \
-                INIT_ID(__typing_unpacked__), \
+                INIT_ID(__typing_unpacked_tuple_args__), \
                 INIT_ID(__warningregistry__), \
                 INIT_ID(__weakref__), \
                 INIT_ID(__xor__), \