[Python-checkins] r83265 - in python/branches/py3k: Lib/pdb.py Misc/NEWS
georg.brandl
python-checkins at python.org
Fri Jul 30 10:54:49 CEST 2010
Author: georg.brandl
Date: Fri Jul 30 10:54:49 2010
New Revision: 83265
Log:
#8015: fix crash when entering an empty line for breakpoint commands. Also restore environment properly when an exception occurs during the definition of commands.
Modified:
python/branches/py3k/Lib/pdb.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/pdb.py
==============================================================================
--- python/branches/py3k/Lib/pdb.py (original)
+++ python/branches/py3k/Lib/pdb.py Fri Jul 30 10:54:49 2010
@@ -509,8 +509,10 @@
return self.handle_command_def(line)
def handle_command_def(self,line):
- """ Handles one command line during command list definition. """
+ """Handles one command line during command list definition."""
cmd, arg, line = self.parseline(line)
+ if not cmd:
+ return
if cmd == 'silent':
self.commands_silent[self.commands_bnum] = True
return # continue to handle other cmd def in the cmd list
@@ -518,7 +520,7 @@
self.cmdqueue = []
return 1 # end of cmd list
cmdlist = self.commands[self.commands_bnum]
- if (arg):
+ if arg:
cmdlist.append(cmd+' '+arg)
else:
cmdlist.append(cmd)
@@ -561,9 +563,11 @@
prompt_back = self.prompt
self.prompt = '(com) '
self.commands_defining = True
- self.cmdloop()
- self.commands_defining = False
- self.prompt = prompt_back
+ try:
+ self.cmdloop()
+ finally:
+ self.commands_defining = False
+ self.prompt = prompt_back
def do_break(self, arg, temporary = 0):
# break [ ([filename:]lineno | function) [, "condition"] ]
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Jul 30 10:54:49 2010
@@ -475,6 +475,9 @@
Library
-------
+- Issue #8015: In pdb, do not crash when an empty line is entered as
+ a breakpoint command.
+
- In pdb, allow giving a line number to the "until" command.
- Issue #1437051: For pdb, allow "continue" and related commands in
More information about the Python-checkins
mailing list