End commands entry on 'end' and ^C and ^D

godlygeek · godlygeek · commit e44a670b0c7a · 2025-04-15T17:17:17.000-04:00
diff --git a/Lib/pdb.py b/Lib/pdb.py
@@ -2706,6 +2706,7 @@ def do_commands(self, arg):
             ]
             # fmt: on
 
+            end_cmds += ["end"]  # pseudo-command
             self._send(commands_entry={"bpnum": bnum, "terminators": end_cmds})
             return
 
@@ -2875,8 +2876,10 @@ def prompt_for_breakpoint_command_list(self, prompt):
                 cmd = self.pdb_instance.parseline(line)[0]
                 if cmd in self.command_list_terminators:
                     break
-            except EOFError:
-                return
+            except (KeyboardInterrupt, EOFError):
+                print(flush=True)
+                print("command definition aborted, old commands restored")
+                break
             finally:
                 self.commands_mode = False
 
