summaryrefslogtreecommitdiffstats
path: root/Lib/bdb.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-01 19:35:16 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-01 19:35:16 (GMT)
commit469d3e78959d41a1a689bf8b6ef0982d0db14272 (patch)
tree11533eb11c229589f077f99e18110a29362ee38d /Lib/bdb.py
parentd343286386521a79ac67d3c6cd14cbf2ef97f460 (diff)
downloadcpython-469d3e78959d41a1a689bf8b6ef0982d0db14272.zip
cpython-469d3e78959d41a1a689bf8b6ef0982d0db14272.tar.gz
cpython-469d3e78959d41a1a689bf8b6ef0982d0db14272.tar.bz2
Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r83259 | georg.brandl | 2010-07-30 09:03:39 +0200 (Fr, 30 Jul 2010) | 1 line Clarification. ........ r83261 | georg.brandl | 2010-07-30 09:21:26 +0200 (Fr, 30 Jul 2010) | 1 line #9230: allow Pdb.checkline() to be called without a current frame, for setting breakpoints before starting debugging. ........ r83264 | georg.brandl | 2010-07-30 10:45:26 +0200 (Fr, 30 Jul 2010) | 1 line Document the "jump" command in pdb.__doc__, and add a version tag for "until X". ........ r83265 | georg.brandl | 2010-07-30 10:54:49 +0200 (Fr, 30 Jul 2010) | 1 line #8015: fix crash when entering an empty line for breakpoint commands. Also restore environment properly when an exception occurs during the definition of commands. ........ r83268 | georg.brandl | 2010-07-30 11:23:23 +0200 (Fr, 30 Jul 2010) | 2 lines Issue #8048: Prevent doctests from failing when sys.displayhook has been reassigned. ........ r83269 | georg.brandl | 2010-07-30 11:43:00 +0200 (Fr, 30 Jul 2010) | 1 line #6719: In pdb, do not stop somewhere in the encodings machinery if the source file to be debugged is in a non-builtin encoding. ........ r83271 | georg.brandl | 2010-07-30 11:59:28 +0200 (Fr, 30 Jul 2010) | 1 line #5727: Restore the ability to use readline when calling into pdb in doctests. ........ r83272 | georg.brandl | 2010-07-30 12:29:19 +0200 (Fr, 30 Jul 2010) | 1 line #5294: Fix the behavior of pdb "continue" command when called in the top-level debugged frame. ........ r83281 | georg.brandl | 2010-07-30 15:36:43 +0200 (Fr, 30 Jul 2010) | 1 line Add myself for pdb. ........
Diffstat (limited to 'Lib/bdb.py')
-rw-r--r--Lib/bdb.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/bdb.py b/Lib/bdb.py
index 3b4f991..f16414d 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -109,6 +109,8 @@ class Bdb:
self.is_skipped_module(frame.f_globals.get('__name__')):
return False
if frame is self.stopframe:
+ if self.stoplineno == -1:
+ return False
return frame.f_lineno >= self.stoplineno
while frame is not None and frame is not self.stopframe:
if frame is self.botframe:
@@ -165,10 +167,12 @@ class Bdb:
but only if we are to stop at or just below this level."""
pass
- def _set_stopinfo(self, stopframe, returnframe, stoplineno=-1):
+ def _set_stopinfo(self, stopframe, returnframe, stoplineno=0):
self.stopframe = stopframe
self.returnframe = returnframe
self.quitting = 0
+ # stoplineno >= 0 means: stop at line >= the stoplineno
+ # stoplineno -1 means: don't stop at all
self.stoplineno = stoplineno
# Derived classes and clients can call the following methods
@@ -181,7 +185,7 @@ class Bdb:
def set_step(self):
"""Stop after one line of code."""
- self._set_stopinfo(None,None)
+ self._set_stopinfo(None, None)
def set_next(self, frame):
"""Stop on the next line in or below the given frame."""
@@ -208,7 +212,7 @@ class Bdb:
def set_continue(self):
# Don't stop except at breakpoints or when finished
- self._set_stopinfo(self.botframe, None)
+ self._set_stopinfo(self.botframe, None, -1)
if not self.breaks:
# no breakpoints; run without debugger overhead
sys.settrace(None)