From 067d734f9e54fa7685ab9bd44e2221c04a52f292 Mon Sep 17 00:00:00 2001 From: Chui Tey Date: Thu, 12 Dec 2002 20:53:19 +0000 Subject: [PATCH] Prevent debugger from stepping into Idle rpc code --- Lib/idlelib/Debugger.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py index 0270f0c36ba..a82fdbb21b5 100644 --- a/Lib/idlelib/Debugger.py +++ b/Lib/idlelib/Debugger.py @@ -13,13 +13,23 @@ def __init__(self, gui): bdb.Bdb.__init__(self) def user_line(self, frame): - # get the currently executing function - ##print>>sys.__stderr__, "*function: ", frame.f_code.co_name - ##print>>sys.__stderr__, "*file: ", frame.f_code.co_filename - ##print>>sys.__stderr__, "*line number: ", frame.f_code.co_firstlineno + co_filename = frame.f_code.co_filename co_name = frame.f_code.co_name + + ## print>>sys.__stderr__, "*function: ", frame.f_code.co_name + ## print>>sys.__stderr__, "*file: ", frame.f_code.co_filename + ## print>>sys.__stderr__, "*line number: ", frame.f_code.co_firstlineno + ## print>>sys.__stderr__, "*name: ", co_name + ## print>>sys.__stderr__, "*function: ", frame.f_locals.get(co_name,None) + try: + # XXX 12 Dec 2002 CGT TO DO: Find way to get a reference to the + # XXX currently running function. If the function has an + # attribute called "DebuggerStepThrough", prevent the debugger + # from stepping through Idle code. The following doesn't work + # in instance methods. Hard coded some workarounds. + func = frame.f_locals[co_name] if getattr(func, "DebuggerStepThrough", 0): print "XXXX DEBUGGER STEPPING THROUGH" @@ -27,7 +37,9 @@ def user_line(self, frame): return except: pass - if co_filename in ('rpc.py', ''): + + # workaround for the problem above + if co_filename in (r'.\rpc.py', 'rpc.py',''): self.set_step() return if co_filename.endswith('threading.py'):