diff options
author | Guido van Rossum <guido@python.org> | 2007-02-09 05:37:30 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-02-09 05:37:30 (GMT) |
commit | be19ed77ddb047e02fe94d142181062af6d99dcc (patch) | |
tree | 70f214e06554046fcccbadeb78665f25e07ce965 /Lib/pdb.py | |
parent | 452bf519a70c3db0e7f0d2540b1bfb07d9085583 (diff) | |
download | cpython-be19ed77ddb047e02fe94d142181062af6d99dcc.zip cpython-be19ed77ddb047e02fe94d142181062af6d99dcc.tar.gz cpython-be19ed77ddb047e02fe94d142181062af6d99dcc.tar.bz2 |
Fix most trivially-findable print statements.
There's one major and one minor category still unfixed:
doctests are the major category (and I hope to be able to augment the
refactoring tool to refactor bona fide doctests soon);
other code generating print statements in strings is the minor category.
(Oh, and I don't know if the compiler package works.)
Diffstat (limited to 'Lib/pdb.py')
-rwxr-xr-x | Lib/pdb.py | 262 |
1 files changed, 130 insertions, 132 deletions
@@ -135,7 +135,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if self._wait_for_mainpyfile: return if self.stop_here(frame): - print >>self.stdout, '--Call--' + print('--Call--', file=self.stdout) self.interaction(frame, None) def user_line(self, frame): @@ -171,7 +171,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def user_return(self, frame, return_value): """This function is called when a return trap is set here.""" frame.f_locals['__return__'] = return_value - print >>self.stdout, '--Return--' + print('--Return--', file=self.stdout) self.interaction(frame, None) def user_exception(self, frame, (exc_type, exc_value, exc_traceback)): @@ -181,7 +181,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if type(exc_type) == type(''): exc_type_name = exc_type else: exc_type_name = exc_type.__name__ - print >>self.stdout, exc_type_name + ':', _saferepr(exc_value) + print(exc_type_name + ':', _saferepr(exc_value), file=self.stdout) self.interaction(frame, exc_traceback) # General interaction function @@ -204,7 +204,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): if type(t) == type(''): exc_type_name = t else: exc_type_name = t.__name__ - print >>self.stdout, '***', exc_type_name + ':', v + print('***', exc_type_name + ':', v, file=self.stdout) def precmd(self, line): """Handle alias expansion and ';;' separator.""" @@ -283,7 +283,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: bnum = int(arg) except: - print >>self.stdout, "Usage : commands [bnum]\n ...\n end" + print("Usage : commands [bnum]\n ...\n end", file=self.stdout) return self.commands_bnum = bnum self.commands[bnum] = [] @@ -300,7 +300,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): # break [ ([filename:]lineno | function) [, "condition"] ] if not arg: if self.breaks: # There's at least one - print >>self.stdout, "Num Type Disp Enb Where" + print("Num Type Disp Enb Where", file=self.stdout) for bp in bdb.Breakpoint.bpbynumber: if bp: bp.bpprint(self.stdout) @@ -322,8 +322,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): filename = arg[:colon].rstrip() f = self.lookupmodule(filename) if not f: - print >>self.stdout, '*** ', repr(filename), - print >>self.stdout, 'not found from sys.path' + print('*** ', repr(filename), end=' ', file=self.stdout) + print('not found from sys.path', file=self.stdout) return else: filename = f @@ -331,7 +331,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: lineno = int(arg) except ValueError as msg: - print >>self.stdout, '*** Bad lineno:', arg + print('*** Bad lineno:', arg, file=self.stdout) return else: # no colon; can be lineno or function @@ -357,10 +357,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): # last thing to try (ok, filename, ln) = self.lineinfo(arg) if not ok: - print >>self.stdout, '*** The specified object', - print >>self.stdout, repr(arg), - print >>self.stdout, 'is not a function' - print >>self.stdout, 'or was not found along sys.path.' + print('*** The specified object', end=' ', file=self.stdout) + print(repr(arg), end=' ', file=self.stdout) + print('is not a function', file=self.stdout) + print('or was not found along sys.path.', file=self.stdout) return funcname = ok # ok contains a function name lineno = int(ln) @@ -371,12 +371,12 @@ class Pdb(bdb.Bdb, cmd.Cmd): if line: # now set the break point err = self.set_break(filename, line, temporary, cond, funcname) - if err: print >>self.stdout, '***', err + if err: print('***', err, file=self.stdout) else: bp = self.get_breaks(filename, line)[-1] - print >>self.stdout, "Breakpoint %d at %s:%d" % (bp.number, + print("Breakpoint %d at %s:%d" % (bp.number, bp.file, - bp.line) + bp.line), file=self.stdout) # To be overridden in derived debuggers def defaultFile(self): @@ -432,13 +432,13 @@ class Pdb(bdb.Bdb, cmd.Cmd): """ line = linecache.getline(filename, lineno) if not line: - print >>self.stdout, 'End of file' + print('End of file', file=self.stdout) return 0 line = line.strip() # Don't allow setting breakpoint at a blank line if (not line or (line[0] == '#') or (line[:3] == '"""') or line[:3] == "'''"): - print >>self.stdout, '*** Blank or comment' + print('*** Blank or comment', file=self.stdout) return 0 return lineno @@ -448,11 +448,11 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: i = int(i) except ValueError: - print >>self.stdout, 'Breakpoint index %r is not a number' % i + print('Breakpoint index %r is not a number' % i, file=self.stdout) continue if not (0 <= i < len(bdb.Breakpoint.bpbynumber)): - print >>self.stdout, 'No breakpoint numbered', i + print('No breakpoint numbered', i, file=self.stdout) continue bp = bdb.Breakpoint.bpbynumber[i] @@ -465,11 +465,11 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: i = int(i) except ValueError: - print >>self.stdout, 'Breakpoint index %r is not a number' % i + print('Breakpoint index %r is not a number' % i, file=self.stdout) continue if not (0 <= i < len(bdb.Breakpoint.bpbynumber)): - print >>self.stdout, 'No breakpoint numbered', i + print('No breakpoint numbered', i, file=self.stdout) continue bp = bdb.Breakpoint.bpbynumber[i] @@ -483,8 +483,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): bpnum = int(args[0].strip()) except ValueError: # something went wrong - print >>self.stdout, \ - 'Breakpoint index %r is not a number' % args[0] + print('Breakpoint index %r is not a number' % args[0], file=self.stdout) try: cond = args[1] except: @@ -493,8 +492,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): if bp: bp.cond = cond if not cond: - print >>self.stdout, 'Breakpoint', bpnum, - print >>self.stdout, 'is now unconditional.' + print('Breakpoint', bpnum, end=' ', file=self.stdout) + print('is now unconditional.', file=self.stdout) def do_ignore(self,arg): """arg is bp number followed by ignore count.""" @@ -503,8 +502,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): bpnum = int(args[0].strip()) except ValueError: # something went wrong - print >>self.stdout, \ - 'Breakpoint index %r is not a number' % args[0] + print('Breakpoint index %r is not a number' % args[0], file=self.stdout) try: count = int(args[1].strip()) except: @@ -518,10 +516,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): reply = reply + '%d crossings' % count else: reply = reply + '1 crossing' - print >>self.stdout, reply + ' of breakpoint %d.' % bpnum + print(reply + ' of breakpoint %d.' % bpnum, file=self.stdout) else: - print >>self.stdout, 'Will stop next time breakpoint', - print >>self.stdout, bpnum, 'is reached.' + print('Will stop next time breakpoint', end=' ', file=self.stdout) + print(bpnum, 'is reached.', file=self.stdout) def do_clear(self, arg): """Three possibilities, tried in this order: @@ -548,24 +546,24 @@ class Pdb(bdb.Bdb, cmd.Cmd): err = "Invalid line number (%s)" % arg else: err = self.clear_break(filename, lineno) - if err: print >>self.stdout, '***', err + if err: print('***', err, file=self.stdout) return numberlist = arg.split() for i in numberlist: try: i = int(i) except ValueError: - print >>self.stdout, 'Breakpoint index %r is not a number' % i + print('Breakpoint index %r is not a number' % i, file=self.stdout) continue if not (0 <= i < len(bdb.Breakpoint.bpbynumber)): - print >>self.stdout, 'No breakpoint numbered', i + print('No breakpoint numbered', i, file=self.stdout) continue err = self.clear_bpbynumber(i) if err: - print >>self.stdout, '***', err + print('***', err, file=self.stdout) else: - print >>self.stdout, 'Deleted breakpoint', i + print('Deleted breakpoint', i, file=self.stdout) do_cl = do_clear # 'c' is already an abbreviation for 'continue' def do_where(self, arg): @@ -575,7 +573,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_up(self, arg): if self.curindex == 0: - print >>self.stdout, '*** Oldest frame' + print('*** Oldest frame', file=self.stdout) else: self.curindex = self.curindex - 1 self.curframe = self.stack[self.curindex][0] @@ -585,7 +583,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_down(self, arg): if self.curindex + 1 == len(self.stack): - print >>self.stdout, '*** Newest frame' + print('*** Newest frame', file=self.stdout) else: self.curindex = self.curindex + 1 self.curframe = self.stack[self.curindex][0] @@ -615,12 +613,12 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_jump(self, arg): if self.curindex + 1 != len(self.stack): - print >>self.stdout, "*** You can only jump within the bottom frame" + print("*** You can only jump within the bottom frame", file=self.stdout) return try: arg = int(arg) except ValueError: - print >>self.stdout, "*** The 'jump' command requires a line number." + print("*** The 'jump' command requires a line number.", file=self.stdout) else: try: # Do the jump, fix up our copy of the stack, and display the @@ -629,7 +627,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.stack[self.curindex] = self.stack[self.curindex][0], arg self.print_stack_entry(self.stack[self.curindex]) except ValueError as e: - print >>self.stdout, '*** Jump failed:', e + print('*** Jump failed:', e, file=self.stdout) do_j = do_jump def do_debug(self, arg): @@ -638,9 +636,9 @@ class Pdb(bdb.Bdb, cmd.Cmd): locals = self.curframe.f_locals p = Pdb() p.prompt = "(%s) " % self.prompt.strip() - print >>self.stdout, "ENTERING RECURSIVE DEBUGGER" + print("ENTERING RECURSIVE DEBUGGER", file=self.stdout) sys.call_tracing(p.run, (arg, globals, locals)) - print >>self.stdout, "LEAVING RECURSIVE DEBUGGER" + print("LEAVING RECURSIVE DEBUGGER", file=self.stdout) sys.settrace(self.trace_dispatch) self.lastcmd = p.lastcmd @@ -653,7 +651,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): do_exit = do_quit def do_EOF(self, arg): - print >>self.stdout + print(file=self.stdout) self._user_requested_quit = 1 self.set_quit() return 1 @@ -667,16 +665,16 @@ class Pdb(bdb.Bdb, cmd.Cmd): if co.co_flags & 8: n = n+1 for i in range(n): name = co.co_varnames[i] - print >>self.stdout, name, '=', - if name in dict: print >>self.stdout, dict[name] - else: print >>self.stdout, "*** undefined ***" + print(name, '=', end=' ', file=self.stdout) + if name in dict: print(dict[name], file=self.stdout) + else: print("*** undefined ***", file=self.stdout) do_a = do_args def do_retval(self, arg): if '__return__' in self.curframe.f_locals: - print >>self.stdout, self.curframe.f_locals['__return__'] + print(self.curframe.f_locals['__return__'], file=self.stdout) else: - print >>self.stdout, '*** Not yet returned!' + print('*** Not yet returned!', file=self.stdout) do_rv = do_retval def _getval(self, arg): @@ -688,12 +686,12 @@ class Pdb(bdb.Bdb, cmd.Cmd): if isinstance(t, str): exc_type_name = t else: exc_type_name = t.__name__ - print >>self.stdout, '***', exc_type_name + ':', repr(v) + print('***', exc_type_name + ':', repr(v), file=self.stdout) raise def do_p(self, arg): try: - print >>self.stdout, repr(self._getval(arg)) + print(repr(self._getval(arg)), file=self.stdout) except: pass @@ -719,7 +717,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): else: first = max(1, int(x) - 5) except: - print >>self.stdout, '*** Error in argument:', repr(arg) + print('*** Error in argument:', repr(arg), file=self.stdout) return elif self.lineno is None: first = max(1, self.curframe.f_lineno - 5) @@ -733,7 +731,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): for lineno in range(first, last+1): line = linecache.getline(filename, lineno) if not line: - print >>self.stdout, '[EOF]' + print('[EOF]', file=self.stdout) break else: s = repr(lineno).rjust(3) @@ -742,7 +740,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): else: s = s + ' ' if lineno == self.curframe.f_lineno: s = s + '->' - print >>self.stdout, s + '\t' + line, + print(s + '\t' + line, end=' ', file=self.stdout) self.lineno = lineno except KeyboardInterrupt: pass @@ -757,23 +755,23 @@ class Pdb(bdb.Bdb, cmd.Cmd): if type(t) == type(''): exc_type_name = t else: exc_type_name = t.__name__ - print >>self.stdout, '***', exc_type_name + ':', repr(v) + print('***', exc_type_name + ':', repr(v), file=self.stdout) return code = None # Is it a function? try: code = value.func_code except: pass if code: - print >>self.stdout, 'Function', code.co_name + print('Function', code.co_name, file=self.stdout) return # Is it an instance method? try: code = value.im_func.func_code except: pass if code: - print >>self.stdout, 'Method', code.co_name + print('Method', code.co_name, file=self.stdout) return # None of the above... - print >>self.stdout, type(value) + print(type(value), file=self.stdout) def do_alias(self, arg): args = arg.split() @@ -781,10 +779,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): keys = self.aliases.keys() keys.sort() for alias in keys: - print >>self.stdout, "%s = %s" % (alias, self.aliases[alias]) + print("%s = %s" % (alias, self.aliases[alias]), file=self.stdout) return if args[0] in self.aliases and len(args) == 1: - print >>self.stdout, "%s = %s" % (args[0], self.aliases[args[0]]) + print("%s = %s" % (args[0], self.aliases[args[0]]), file=self.stdout) else: self.aliases[args[0]] = ' '.join(args[1:]) @@ -816,11 +814,11 @@ class Pdb(bdb.Bdb, cmd.Cmd): def print_stack_entry(self, frame_lineno, prompt_prefix=line_prefix): frame, lineno = frame_lineno if frame is self.curframe: - print >>self.stdout, '>', + print('>', end=' ', file=self.stdout) else: - print >>self.stdout, ' ', - print >>self.stdout, self.format_stack_entry(frame_lineno, - prompt_prefix) + print(' ', end=' ', file=self.stdout) + print(self.format_stack_entry(frame_lineno, + prompt_prefix), file=self.stdout) # Help methods (derived from pdb.doc) @@ -829,20 +827,20 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.help_h() def help_h(self): - print >>self.stdout, """h(elp) + print("""h(elp) Without argument, print the list of available commands. With a command name as argument, print help about that command "help pdb" pipes the full documentation file to the $PAGER -"help exec" gives help on the ! command""" +"help exec" gives help on the ! command""", file=self.stdout) def help_where(self): self.help_w() def help_w(self): - print >>self.stdout, """w(here) + print("""w(here) Print a stack trace, with the most recent frame at the bottom. An arrow indicates the "current frame", which determines the -context of most commands. 'bt' is an alias for this command.""" +context of most commands. 'bt' is an alias for this command.""", file=self.stdout) help_bt = help_w @@ -850,23 +848,23 @@ context of most commands. 'bt' is an alias for this command.""" self.help_d() def help_d(self): - print >>self.stdout, """d(own) + print("""d(own) Move the current frame one level down in the stack trace -(to a newer frame).""" +(to a newer frame).""", file=self.stdout) def help_up(self): self.help_u() def help_u(self): - print >>self.stdout, """u(p) + print("""u(p) Move the current frame one level up in the stack trace -(to an older frame).""" +(to an older frame).""", file=self.stdout) def help_break(self): self.help_b() def help_b(self): - print >>self.stdout, """b(reak) ([file:]lineno | function) [, condition] + print("""b(reak) ([file:]lineno | function) [, condition] With a line number argument, set a break there in the current file. With a function name, set a break at first executable line of that function. Without argument, list all breaks. If a second @@ -876,14 +874,14 @@ which must evaluate to true before the breakpoint is honored. The line number may be prefixed with a filename and a colon, to specify a breakpoint in another file (probably one that hasn't been loaded yet). The file is searched for on sys.path; -the .py suffix may be omitted.""" +the .py suffix may be omitted.""", file=self.stdout) def help_clear(self): self.help_cl() def help_cl(self): - print >>self.stdout, "cl(ear) filename:lineno" - print >>self.stdout, """cl(ear) [bpnumber [bpnumber...]] + print("cl(ear) filename:lineno", file=self.stdout) + print("""cl(ear) [bpnumber [bpnumber...]] With a space separated list of breakpoint numbers, clear those breakpoints. Without argument, clear all breaks (but first ask confirmation). With a filename:lineno argument, @@ -892,59 +890,59 @@ clear all breaks at that line in that file. Note that the argument is different from previous versions of the debugger (in python distributions 1.5.1 and before) where a linenumber was used instead of either filename:lineno or -breakpoint numbers.""" +breakpoint numbers.""", file=self.stdout) def help_tbreak(self): - print >>self.stdout, """tbreak same arguments as break, but breakpoint is -removed when first hit.""" + print("""tbreak same arguments as break, but breakpoint is +removed when first hit.""", file=self.stdout) def help_enable(self): - print >>self.stdout, """enable bpnumber [bpnumber ...] + print("""enable bpnumber [bpnumber ...] Enables the breakpoints given as a space separated list of -bp numbers.""" +bp numbers.""", file=self.stdout) def help_disable(self): - print >>self.stdout, """disable bpnumber [bpnumber ...] + print("""disable bpnumber [bpnumber ...] Disables the breakpoints given as a space separated list of -bp numbers.""" +bp numbers.""", file=self.stdout) def help_ignore(self): - print >>self.stdout, """ignore bpnumber count + print("""ignore bpnumber count Sets the ignore count for the given breakpoint number. A breakpoint becomes active when the ignore count is zero. When non-zero, the count is decremented each time the breakpoint is reached and the breakpoint is not disabled and any associated condition evaluates -to true.""" +to true.""", file=self.stdout) def help_condition(self): - print >>self.stdout, """condition bpnumber str_condition + print("""condition bpnumber str_condition str_condition is a string specifying an expression which must evaluate to true before the breakpoint is honored. If str_condition is absent, any existing condition is removed; -i.e., the breakpoint is made unconditional.""" +i.e., the breakpoint is made unconditional.""", file=self.stdout) def help_step(self): self.help_s() def help_s(self): - print >>self.stdout, """s(tep) + print("""s(tep) Execute the current line, stop at the first possible occasion -(either in a function that is called or in the current function).""" +(either in a function that is called or in the current function).""", file=self.stdout) def help_next(self): self.help_n() def help_n(self): - print >>self.stdout, """n(ext) + print("""n(ext) Continue execution until the next line in the current function -is reached or it returns.""" +is reached or it returns.""", file=self.stdout) def help_return(self): self.help_r() def help_r(self): - print >>self.stdout, """r(eturn) -Continue execution until the current function returns.""" + print("""r(eturn) +Continue execution until the current function returns.""", file=self.stdout) def help_continue(self): self.help_c() @@ -953,51 +951,51 @@ Continue execution until the current function returns.""" self.help_c() def help_c(self): - print >>self.stdout, """c(ont(inue)) -Continue execution, only stop when a breakpoint is encountered.""" + print("""c(ont(inue)) +Continue execution, only stop when a breakpoint is encountered.""", file=self.stdout) def help_jump(self): self.help_j() def help_j(self): - print >>self.stdout, """j(ump) lineno -Set the next line that will be executed.""" + print("""j(ump) lineno +Set the next line that will be executed.""", file=self.stdout) def help_debug(self): - print >>self.stdout, """debug code + print("""debug code Enter a recursive debugger that steps through the code argument (which is an arbitrary expression or statement to be executed -in the current environment).""" +in the current environment).""", file=self.stdout) def help_list(self): self.help_l() def help_l(self): - print >>self.stdout, """l(ist) [first [,last]] + print("""l(ist) [first [,last]] List source code for the current file. Without arguments, list 11 lines around the current line or continue the previous listing. With one argument, list 11 lines starting at that line. With two arguments, list the given range; -if the second argument is less than the first, it is a count.""" +if the second argument is less than the first, it is a count.""", file=self.stdout) def help_args(self): self.help_a() def help_a(self): - print >>self.stdout, """a(rgs) -Print the arguments of the current function.""" + print("""a(rgs) +Print the arguments of the current function.""", file=self.stdout) def help_p(self): - print >>self.stdout, """p expression -Print the value of the expression.""" + print("""p expression +Print the value of the expression.""", file=self.stdout) def help_pp(self): - print >>self.stdout, """pp expression -Pretty-print the value of the expression.""" + print("""pp expression +Pretty-print the value of the expression.""", file=self.stdout) def help_exec(self): - print >>self.stdout, """(!) statement + print("""(!) statement Execute the (one-line) statement in the context of the current stack frame. The exclamation point can be omitted unless the first word @@ -1005,27 +1003,27 @@ of the statement resembles a debugger command. To assign to a global variable you must always prefix the command with a 'global' command, e.g.: (Pdb) global list_options; list_options = ['-l'] -(Pdb)""" +(Pdb)""", file=self.stdout) def help_quit(self): self.help_q() def help_q(self): - print >>self.stdout, """q(uit) or exit - Quit from the debugger. -The program being executed is aborted.""" + print("""q(uit) or exit - Quit from the debugger. +The program being executed is aborted.""", file=self.stdout) help_exit = help_q def help_whatis(self): - print >>self.stdout, """whatis arg -Prints the type of the argument.""" + print("""whatis arg +Prints the type of the argument.""", file=self.stdout) def help_EOF(self): - print >>self.stdout, """EOF -Handles the receipt of EOF as a command.""" + print("""EOF +Handles the receipt of EOF as a command.""", file=self.stdout) def help_alias(self): - print >>self.stdout, """alias [name [command [parameter parameter ...] ]] + print("""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 @@ -1046,14 +1044,14 @@ alias pi for k in %1.__dict__.keys(): print "%1.",k,"=",%1.__dict__[k] #Print instance variables in self alias ps pi self -""" +""", file=self.stdout) def help_unalias(self): - print >>self.stdout, """unalias name -Deletes the specified alias.""" + print("""unalias name +Deletes the specified alias.""", file=self.stdout) def help_commands(self): - print >>self.stdout, """commands [bpnumber] + print("""commands [bpnumber] (com) ... (com) end (Pdb) @@ -1085,7 +1083,7 @@ usual message about stopping at a breakpoint is not printed. This may be desirable for breakpoints that are to print a specific message and then continue. If none of the other commands print anything, you see no sign that the breakpoint was reached. -""" +""", file=self.stdout) def help_pdb(self): help() @@ -1176,20 +1174,20 @@ def help(): fullname = os.path.join(dirname, 'pdb.doc') if os.path.exists(fullname): sts = os.system('${PAGER-more} '+fullname) - if sts: print '*** Pager exit status:', sts + if sts: print('*** Pager exit status:', sts) break else: - print 'Sorry, can\'t find the help file "pdb.doc"', - print 'along the Python search path' + print('Sorry, can\'t find the help file "pdb.doc"', end=' ') + print('along the Python search path') def main(): if not sys.argv[1:]: - print "usage: pdb.py scriptfile [arg] ..." + print("usage: pdb.py scriptfile [arg] ...") sys.exit(2) mainpyfile = sys.argv[1] # Get script filename if not os.path.exists(mainpyfile): - print 'Error:', mainpyfile, 'does not exist' + print('Error:', mainpyfile, 'does not exist') sys.exit(1) del sys.argv[0] # Hide "pdb.py" from argument list @@ -1208,20 +1206,20 @@ def main(): pdb._runscript(mainpyfile) if pdb._user_requested_quit: break - print "The program finished and will be restarted" + print("The program finished and will be restarted") except SystemExit: # In most cases SystemExit does not warrant a post-mortem session. - print "The program exited via sys.exit(). Exit status: ", - print sys.exc_info()[1] + print("The program exited via sys.exit(). Exit status: ", end=' ') + print(sys.exc_info()[1]) except: traceback.print_exc() - print "Uncaught exception. Entering post mortem debugging" - print "Running 'cont' or 'step' will restart the program" + print("Uncaught exception. Entering post mortem debugging") + print("Running 'cont' or 'step' will restart the program") t = sys.exc_info()[2] while t.tb_next is not None: t = t.tb_next pdb.interaction(t.tb_frame,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 |