diff options
Diffstat (limited to 'Lib/pdb.py')
| -rwxr-xr-x | Lib/pdb.py | 85 |
1 files changed, 52 insertions, 33 deletions
diff --git a/Lib/pdb.py b/Lib/pdb.py index 683abb9cb6..a6109d45e8 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -58,8 +58,8 @@ line_prefix = '\n-> ' # Probably a better default class Pdb(bdb.Bdb, cmd.Cmd): - def __init__(self, completekey='tab', stdin=None, stdout=None): - bdb.Bdb.__init__(self) + def __init__(self, completekey='tab', stdin=None, stdout=None, skip=None): + bdb.Bdb.__init__(self, skip=skip) cmd.Cmd.__init__(self, completekey, stdin, stdout) if stdout: self.use_rawinput = 0 @@ -95,10 +95,14 @@ class Pdb(bdb.Bdb, cmd.Cmd): rcFile.close() self.commands = {} # associates a command list to breakpoint numbers - self.commands_doprompt = {} # for each bp num, tells if the prompt must be disp. after execing the cmd list - self.commands_silent = {} # for each bp num, tells if the stack trace must be disp. after execing the cmd list - self.commands_defining = False # True while in the process of defining a command list - self.commands_bnum = None # The breakpoint number for which we are defining a list + self.commands_doprompt = {} # for each bp num, tells if the prompt + # must be disp. after execing the cmd list + self.commands_silent = {} # for each bp num, tells if the stack trace + # must be disp. after execing the cmd list + self.commands_defining = False # True while in the process of defining + # a command list + self.commands_bnum = None # The breakpoint number for which we are + # defining a list def reset(self): bdb.Bdb.reset(self) @@ -114,6 +118,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.forget() self.stack, self.curindex = self.get_stack(f, t) self.curframe = self.stack[self.curindex][0] + # The f_locals dictionary is updated from the actual frame + # locals whenever the .f_locals accessor is called, so we + # cache it here to ensure that modifications are not overwritten. + self.curframe_locals = self.curframe.f_locals self.execRcLines() # Can be executed earlier than 'setup' if desired @@ -150,10 +158,14 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.interaction(frame, None) def bp_commands(self,frame): - """ Call every command that was set for the current active breakpoint (if there is one) - Returns True if the normal interaction function must be called, False otherwise """ - #self.currentbp is set in bdb.py in bdb.break_here if a breakpoint was hit - if getattr(self,"currentbp",False) and self.currentbp in self.commands: + """Call every command that was set for the current active breakpoint + (if there is one). + + Returns True if the normal interaction function must be called, + False otherwise.""" + # self.currentbp is set in bdb in Bdb.break_here if a breakpoint was hit + if getattr(self, "currentbp", False) and \ + self.currentbp in self.commands: currentbp = self.currentbp self.currentbp = 0 lastcmd_back = self.lastcmd @@ -208,7 +220,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def default(self, line): if line[:1] == '!': line = line[1:] - locals = self.curframe.f_locals + locals = self.curframe_locals globals = self.curframe.f_globals try: code = compile(line + '\n', '<stdin>', 'single') @@ -289,7 +301,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): func = getattr(self, 'do_' + cmd) except AttributeError: func = self.default - if func.func_name in self.commands_resuming : # one of the resuming commands. + # one of the resuming commands + if func.func_name in self.commands_resuming: self.commands_doprompt[self.commands_bnum] = False self.cmdqueue = [] return 1 @@ -302,15 +315,18 @@ class Pdb(bdb.Bdb, cmd.Cmd): do_h = cmd.Cmd.do_help def do_commands(self, arg): - """Defines a list of commands associated to a breakpoint - Those commands will be executed whenever the breakpoint causes the program to stop execution.""" + """Defines a list of commands associated to a breakpoint. + + Those commands will be executed whenever the breakpoint causes + the program to stop execution.""" if not arg: bnum = len(bdb.Breakpoint.bpbynumber)-1 else: try: bnum = int(arg) except: - print >>self.stdout, "Usage : commands [bnum]\n ...\n end" + print >>self.stdout, "Usage : commands [bnum]\n ..." \ + "\n end" return self.commands_bnum = bnum self.commands[bnum] = [] @@ -370,7 +386,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: func = eval(arg, self.curframe.f_globals, - self.curframe.f_locals) + self.curframe_locals) except: func = arg try: @@ -621,6 +637,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): else: self.curindex = self.curindex - 1 self.curframe = self.stack[self.curindex][0] + self.curframe_locals = self.curframe.f_locals self.print_stack_entry(self.stack[self.curindex]) self.lineno = None do_u = do_up @@ -631,6 +648,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): else: self.curindex = self.curindex + 1 self.curframe = self.stack[self.curindex][0] + self.curframe_locals = self.curframe.f_locals self.print_stack_entry(self.stack[self.curindex]) self.lineno = None do_d = do_down @@ -651,8 +669,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): do_n = do_next def do_run(self, arg): - """Restart program by raising an exception to be caught in the main debugger - loop. If arguments were given, set them in sys.argv.""" + """Restart program by raising an exception to be caught in the main + debugger loop. If arguments were given, set them in sys.argv.""" if arg: import shlex argv0 = sys.argv[0:1] @@ -694,7 +712,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_debug(self, arg): sys.settrace(None) globals = self.curframe.f_globals - locals = self.curframe.f_locals + locals = self.curframe_locals p = Pdb(self.completekey, self.stdin, self.stdout) p.prompt = "(%s) " % self.prompt.strip() print >>self.stdout, "ENTERING RECURSIVE DEBUGGER" @@ -718,9 +736,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): return 1 def do_args(self, arg): - f = self.curframe - co = f.f_code - dict = f.f_locals + co = self.curframe.f_code + dict = self.curframe_locals n = co.co_argcount if co.co_flags & 4: n = n+1 if co.co_flags & 8: n = n+1 @@ -732,8 +749,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): do_a = do_args def do_retval(self, arg): - if '__return__' in self.curframe.f_locals: - print >>self.stdout, self.curframe.f_locals['__return__'] + if '__return__' in self.curframe_locals: + print >>self.stdout, self.curframe_locals['__return__'] else: print >>self.stdout, '*** Not yet returned!' do_rv = do_retval @@ -741,7 +758,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def _getval(self, arg): try: return eval(arg, self.curframe.f_globals, - self.curframe.f_locals) + self.curframe_locals) except: t, v = sys.exc_info()[:2] if isinstance(t, str): @@ -790,7 +807,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): breaklist = self.get_file_breaks(filename) try: for lineno in range(first, last+1): - line = linecache.getline(filename, lineno, self.curframe.f_globals) + line = linecache.getline(filename, lineno, + self.curframe.f_globals) if not line: print >>self.stdout, '[EOF]' break @@ -810,7 +828,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_whatis(self, arg): try: value = eval(arg, self.curframe.f_globals, - self.curframe.f_locals) + self.curframe_locals) except: t, v = sys.exc_info()[:2] if type(t) == type(''): @@ -954,8 +972,8 @@ a linenumber was used instead of either filename:lineno or breakpoint numbers.""" def help_tbreak(self): - print >>self.stdout, """tbreak same arguments as break, but breakpoint is -removed when first hit.""" + print >>self.stdout, """tbreak same arguments as break, but breakpoint +is removed when first hit.""" def help_enable(self): print >>self.stdout, """enable bpnumber [bpnumber ...] @@ -1101,7 +1119,7 @@ Prints the type of the argument.""" Handles the receipt of EOF as a command.""" def help_alias(self): - print >>self.stdout, """alias [name [command [parameter parameter ...] ]] + print >>self.stdout, """alias [name [command [parameter parameter ...]]] Creates an alias called 'name' the executes 'command'. The command must *not* be enclosed in quotes. Replaceable parameters are indicated by %1, %2, and so on, while %* is replaced by all the @@ -1288,8 +1306,8 @@ def main(): # Note on saving/restoring sys.argv: it's a good idea when sys.argv was # modified by the script being debugged. It's a bad idea when it was - # changed by the user from the command line. There is a "restart" command which - # allows explicit specification of command line arguments. + # changed by the user from the command line. There is a "restart" command + # which allows explicit specification of command line arguments. pdb = Pdb() while True: try: @@ -1310,7 +1328,8 @@ def main(): print "Running 'cont' or 'step' will restart the program" t = sys.exc_info()[2] pdb.interaction(None, t) - print "Post mortem debugger finished. The "+mainpyfile+" will be restarted" + print "Post mortem debugger finished. The " + mainpyfile + \ + " will be restarted" # When invoked as main program, invoke the debugger on a script |