Merge branch 'main' into gh-156466-3

Author: iritkatriel

Lib/turtledemo/sorting_animate.py

@@ -178,7 +178,6 @@ def enable_keys():
     onkey(start_ssort, "s")
     onkey(start_qsort, "q")
     onkey(randomize, "r")
-    onkey(bye, "space")
 
 def main():
     getscreen().clearscreen()
@@ -191,7 +190,7 @@ def main():
     return "EVENTLOOP"
 
 instructions1 = "press i for insertion sort, s for selection sort, q for quicksort"
-instructions2 = "spacebar to quit, r to randomize"
+instructions2 = "r to randomize"
 
 if __name__=="__main__":
     msg = main()

Misc/NEWS.d/next/Library/2024-11-08-18-39-50.gh-issue-125763.F2p5_U.rst

@@ -0,0 +1 @@
+Remove the broken spacebar quit binding from :mod:`turtledemo`\s ``sorting_animate`` example.

Python/codegen.c

@@ -1196,7 +1196,7 @@ codegen_function_annotations(compiler *c, location loc,
         RETURN_IF_ERROR_IN_SCOPE(
             c, codegen_annotations_in_scope(c, loc, args, returns, &annotations_len)
         );
-        ADDOP_I(c, loc, BUILD_MAP, annotations_len);
+        ADDOP_I_IN_SCOPE(c, loc, BUILD_MAP, annotations_len);
         RETURN_IF_ERROR(codegen_finish_annotations_scope(c, loc));
         return MAKE_FUNCTION_ANNOTATE;
     }