Merge branch 'main' into gh-138514-fix-getpass-echo-char

Author: bkjoh

Python/codegen.c

@@ -5414,23 +5414,6 @@ codegen_check_ann_expr(compiler *c, expr_ty e)
     return SUCCESS;
 }
 
-static int
-codegen_check_annotation(compiler *c, stmt_ty s)
-{
-    /* Annotations of complex targets does not produce anything
-       under annotations future */
-    if (FUTURE_FEATURES(c) & CO_FUTURE_ANNOTATIONS) {
-        return SUCCESS;
-    }
-
-    /* Annotations are only evaluated in a module or class. */
-    if (SCOPE_TYPE(c) == COMPILE_SCOPE_MODULE ||
-        SCOPE_TYPE(c) == COMPILE_SCOPE_CLASS) {
-        return codegen_check_ann_expr(c, s->v.AnnAssign.annotation);
-    }
-    return SUCCESS;
-}
-
 static int
 codegen_check_ann_subscr(compiler *c, expr_ty e)
 {
@@ -5524,10 +5507,6 @@ codegen_annassign(compiler *c, stmt_ty s)
                      targ->kind);
         return ERROR;
     }
-    /* Annotation is evaluated last. */
-    if (future_annotations && !s->v.AnnAssign.simple && codegen_check_annotation(c, s) < 0) {
-        return ERROR;
-    }
     return SUCCESS;
 }