From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Thu, 20 Jun 2024 05:42:30 +0000 (-0700)
Subject: gh-119698: symtable: Fix merge race (#120779)
X-Git-Tag: v3.14.0a1~1398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3846fcfb928753bd52265ba67a9b4ceae51d2ef3;p=thirdparty%2FPython%2Fcpython.git

gh-119698: symtable: Fix merge race (#120779)
---

diff --git a/Lib/symtable.py b/Lib/symtable.py
index fee3c43163f6..221aaf88d416 100644
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -250,7 +250,7 @@ class Class(SymbolTable):
                     match st.type:
                         case _symtable.TYPE_FUNCTION:
                             d[st.name] = 1
-                        case _symtable.TYPE_TYPE_PARAM:
+                        case _symtable.TYPE_TYPE_PARAMETERS:
                             # Get the function-def block in the annotation
                             # scope 'st' with the same identifier, if any.
                             scope_name = st.name