mirror of
https://github.com/python/cpython.git
synced 2025-09-04 07:51:13 +00:00
Fix SF bug 579701 (Fernando Pérez); an input line consisting of one or
more spaces only crashed pdb. While I was at it, cleaned up some style nits (spaces between function and parenthesis, and redundant parentheses in if statement).
This commit is contained in:
parent
2ad9419c8f
commit
08454596d1
1 changed files with 8 additions and 8 deletions
16
Lib/pdb.py
16
Lib/pdb.py
|
@ -102,8 +102,8 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
self.rcLines = []
|
self.rcLines = []
|
||||||
for line in rcLines:
|
for line in rcLines:
|
||||||
line = line[:-1]
|
line = line[:-1]
|
||||||
if len (line) > 0 and line[0] != '#':
|
if len(line) > 0 and line[0] != '#':
|
||||||
self.onecmd (line)
|
self.onecmd(line)
|
||||||
|
|
||||||
# Override Bdb methods (except user_call, for now)
|
# Override Bdb methods (except user_call, for now)
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
|
|
||||||
def precmd(self, line):
|
def precmd(self, line):
|
||||||
"""Handle alias expansion and ';;' separator."""
|
"""Handle alias expansion and ';;' separator."""
|
||||||
if not line:
|
if not line.strip():
|
||||||
return line
|
return line
|
||||||
args = line.split()
|
args = line.split()
|
||||||
while args[0] in self.aliases:
|
while args[0] in self.aliases:
|
||||||
|
@ -321,8 +321,8 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
return 0
|
return 0
|
||||||
line = line.strip()
|
line = line.strip()
|
||||||
# Don't allow setting breakpoint at a blank line
|
# Don't allow setting breakpoint at a blank line
|
||||||
if ( not line or (line[0] == '#') or
|
if (not line or (line[0] == '#') or
|
||||||
(line[:3] == '"""') or line[:3] == "'''" ):
|
(line[:3] == '"""') or line[:3] == "'''"):
|
||||||
print '*** Blank or comment'
|
print '*** Blank or comment'
|
||||||
return 0
|
return 0
|
||||||
# When a file is read in and a breakpoint is at
|
# When a file is read in and a breakpoint is at
|
||||||
|
@ -401,9 +401,9 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
bp = bdb.Breakpoint.bpbynumber[bpnum]
|
bp = bdb.Breakpoint.bpbynumber[bpnum]
|
||||||
if bp:
|
if bp:
|
||||||
bp.ignore = count
|
bp.ignore = count
|
||||||
if (count > 0):
|
if count > 0:
|
||||||
reply = 'Will ignore next '
|
reply = 'Will ignore next '
|
||||||
if (count > 1):
|
if count > 1:
|
||||||
reply = reply + '%d crossings' % count
|
reply = reply + '%d crossings' % count
|
||||||
else:
|
else:
|
||||||
reply = reply + '1 crossing'
|
reply = reply + '1 crossing'
|
||||||
|
@ -614,7 +614,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
for alias in keys:
|
for alias in keys:
|
||||||
print "%s = %s" % (alias, self.aliases[alias])
|
print "%s = %s" % (alias, self.aliases[alias])
|
||||||
return
|
return
|
||||||
if args[0] in self.aliases and len (args) == 1:
|
if args[0] in self.aliases and len(args) == 1:
|
||||||
print "%s = %s" % (args[0], self.aliases[args[0]])
|
print "%s = %s" % (args[0], self.aliases[args[0]])
|
||||||
else:
|
else:
|
||||||
self.aliases[args[0]] = ' '.join(args[1:])
|
self.aliases[args[0]] = ' '.join(args[1:])
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue