Allow giving an explicit line number to "until".

diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst
index e279db8b9704f39d9c7fdc50a47adc6343849e71..7f44c089fcb261fd4c5eb8276bdae03be57ba7b5 100644 (file)
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -330,10 +330,14 @@ by the local file.
    executes called functions at (nearly) full speed, only stopping at the next
    line in the current function.)
 
-.. pdbcommand:: unt(il)
+.. pdbcommand:: unt(il) [lineno]
 
-   Continue execution until the line with the line number greater than the
-   current one is reached or when returning from current frame.
+   Without argument, continue execution until the line with a number greater
+   than the current one is reached.
+
+   With a line number, continue execution until a line with a number greater or
+   equal to that is reached.  In both cases, also stop when the current frame
+   returns.
 
 .. pdbcommand:: r(eturn)
 

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 3b4f99170bdfcdfc0fc2bddddb3ea538ec8d33d2..cee71a41bd862b4ec8119e5136c5ff942f059d93 100644 (file)
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -174,10 +174,13 @@ class Bdb:
     # Derived classes and clients can call the following methods
     # to affect the stepping state.
 
-    def set_until(self, frame): #the name "until" is borrowed from gdb
+    def set_until(self, frame, lineno=None):
         """Stop when the line with the line no greater than the current one is
         reached or when returning from current frame"""
-        self._set_stopinfo(frame, frame, frame.f_lineno+1)
+        # the name "until" is borrowed from gdb
+        if lineno is None:
+            lineno = frame.f_lineno + 1
+        self._set_stopinfo(frame, frame, lineno)
 
     def set_step(self):
         """Stop after one line of code."""

diff --git a/Lib/pdb.py b/Lib/pdb.py
index c16cde6bd7460a0a34dfb02e80f43fb1b6abb7ef..7c6b84854ca0538e5ec46a1166612c71c0a69c93 100755 (executable)
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -71,11 +71,11 @@ w(here)
         An arrow indicates the "current frame", which determines the
         context of most commands.
 
-d(own) [ count ]
+d(own) [count]
         Move the current frame count (default one) levels down in the
         stack trace (to a newer frame).
 
-u(p) [ count ]
+u(p) [count]
         Move the current frame count (default one) levels up in the
         stack trace (to an older frame).
 
@@ -140,9 +140,12 @@ n(ext)
         Continue execution until the next line in the current function
         is reached or it returns.
 
-unt(il)
-        Continue execution until the line with a number greater than
-        the current one is reached or until the current frame returns.
+unt(il) [lineno]
+        Without argument, continue execution until the line with a
+        number greater than the current one is reached.  With a line
+        number, continue execution until a line with a number greater
+        or equal to that is reached.  In both cases, also stop when
+        the current frame returns.
 
 r(eturn)
         Continue execution until the current function returns.
@@ -883,7 +886,19 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     do_d = do_down
 
     def do_until(self, arg):
-        self.set_until(self.curframe)
+        if arg:
+            try:
+                lineno = int(arg)
+            except ValueError:
+                print('*** Error in argument:', repr(arg), file=self.stdout)
+                return
+            if lineno <= self.curframe.f_lineno:
+                print('*** "until" line number is smaller than current '
+                      'line number', file=self.stdout)
+                return
+        else:
+            lineno = None
+        self.set_until(self.curframe, lineno)
         return 1
     do_unt = do_until
 
@@ -1518,8 +1533,8 @@ and in the current directory, if they exist.  Commands supplied with
 -c are executed after commands from .pdbrc files.
 
 To let the script run until an exception occurs, use "-c continue".
-To let the script run until a given line X in the debugged file, use
-"-c 'break X' -c continue"."""
+To let the script run up to a given line X in the debugged file, use
+"-c 'until X'"."""
 
 def main():
     import getopt

diff --git a/Misc/NEWS b/Misc/NEWS
index c72107ac823ca08fbc23ba2f2bf69f915a5981b6..a68cc73b32c89a765a2918a0dbccc5eccdc8abd4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -475,6 +475,8 @@ C-API
 Library
 -------
 
+- In pdb, allow giving a line number to the "until" command.
+
 - Issue #1437051: For pdb, allow "continue" and related commands in
   .pdbrc files.  Also, add a command-line option "-c" that runs a
   command as if given in .pdbrc.