traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debugger can now show local and global variables.

This commit is contained in:
Guido van Rossum 1998-10-16 18:59:39 +00:00
parent 0a0f11b6d4
commit 5188a25efe
2 changed files with 92 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Tools/idle/Debugger.py
View File

@ -3,6 +3,8 @@ import bdb
import traceback import traceback
from Tkinter import * from Tkinter import *
import StackViewer
class Debugger(bdb.Bdb): class Debugger(bdb.Bdb):
@ -85,6 +87,13 @@ class Debugger(bdb.Bdb):
self.status.pack(anchor="w") self.status.pack(anchor="w")
self.error = Label(top, anchor="w") self.error = Label(top, anchor="w")
self.error.pack(anchor="w") self.error.pack(anchor="w")
#
self.fstack = Frame(top, height=1)
self.fstack.pack(expand=1, fill="both")
self.flocals = Frame(top)
self.flocals.pack(expand=1, fill="both")
self.fglobals = Frame(top, height=1)
self.fglobals.pack(expand=1, fill="both")
def interaction(self, frame, info=None): def interaction(self, frame, info=None):
self.frame = frame self.frame = frame
@ -115,6 +124,15 @@ class Debugger(bdb.Bdb):
if sv: if sv:
stack, i = self.get_stack(self.frame, tb) stack, i = self.get_stack(self.frame, tb)
sv.load_stack(stack, i) sv.load_stack(stack, i)
lv = self.localsviewer
gv = self.globalsviewer
if lv:
if not gv or self.frame.f_locals is not self.frame.f_globals:
lv.load_dict(self.frame.f_locals)
else:
lv.load_dict(None)
if gv:
gv.load_dict(self.frame.f_globals)
if self.vsource.get(): if self.vsource.get():
self.sync_source_line() self.sync_source_line()
for b in self.buttons: for b in self.buttons:
@ -159,9 +177,8 @@ class Debugger(bdb.Bdb):
def show_stack(self): def show_stack(self):
if not self.stackviewer and self.vstack.get(): if not self.stackviewer and self.vstack.get():
import StackViewer
self.stackviewer = sv = StackViewer.StackViewer( self.stackviewer = sv = StackViewer.StackViewer(
self.top, self.flist, self) self.fstack, self.flist, self)
if self.frame: if self.frame:
stack, i = self.get_stack(self.frame, None) stack, i = self.get_stack(self.frame, None)
sv.load_stack(stack, i) sv.load_stack(stack, i)
@ -170,16 +187,37 @@ class Debugger(bdb.Bdb):
if sv and not self.vstack.get(): if sv and not self.vstack.get():
self.stackviewer = None self.stackviewer = None
sv.close() sv.close()
self.fstack['height'] = 1
def show_source(self): def show_source(self):
if self.vsource.get(): if self.vsource.get():
self.sync_source_line() self.sync_source_line()
def show_frame(self, (frame, lineno)): def show_frame(self, (frame, lineno)):
print frame, lineno pass
localsviewer = None
def show_locals(self): def show_locals(self):
pass lv = self.localsviewer
if not lv and self.vlocals.get():
self.localsviewer = lv = StackViewer.NamespaceViewer(
self.flocals, "Locals")
if self.frame:
lv.load_dict(self.frame.f_locals)
elif lv and not self.vlocals.get():
self.localsviewer = None
lv.close()
globalsviewer = None
def show_globals(self): def show_globals(self):
pass lv = self.globalsviewer
if not lv and self.vglobals.get():
self.globalsviewer = lv = StackViewer.NamespaceViewer(
self.fglobals, "Locals")
if self.frame:
lv.load_dict(self.frame.f_globals)
elif lv and not self.vglobals.get():
self.globalsviewer = None
lv.close()

80
Tools/idle/StackViewer.py
View File

@ -107,7 +107,8 @@ class StackViewer(ScrolledList):
## else: ## else:
## l["height"] = len(stack) ## l["height"] = len(stack)
## self.topframe.pack(expand=0) ## self.topframe.pack(expand=0)
for frame, lineno in stack: for i in range(len(stack)):
frame, lineno = stack[i]
try: try:
modname = frame.f_globals["__name__"] modname = frame.f_globals["__name__"]
except: except:
@ -122,6 +123,8 @@ class StackViewer(ScrolledList):
else: else:
item = "%s.%s(), line %d: %s" % (modname, funcname, item = "%s.%s(), line %d: %s" % (modname, funcname,
lineno, sourceline) lineno, sourceline)
if i == index:
item = "> " + item
self.append(item) self.append(item)
if index is not None: if index is not None:
self.select(index) self.select(index)
@ -189,20 +192,24 @@ def getexception(type=None, value=None):
class NamespaceViewer: class NamespaceViewer:
def __init__(self, master, title, dict): def __init__(self, master, title, dict=None):
width = 0 width = 0
height = 20*len(dict) # XXX 20 == observed height of Entry widget height = 40
if dict:
height = 20*len(dict) # XXX 20 == observed height of Entry widget
self.master = master self.master = master
self.title = title self.title = title
self.dict = dict self.dict = dict
self.repr = Repr() self.repr = Repr()
self.repr.maxstring = 60 self.repr.maxstring = 60
self.repr.maxother = 60 self.repr.maxother = 60
self.label = Label(master, text=title, borderwidth=2, relief="groove") self.frame = frame = Frame(master)
self.frame.pack(expand=1, fill="both")
self.label = Label(frame, text=title, borderwidth=2, relief="groove")
self.label.pack(fill="x") self.label.pack(fill="x")
self.vbar = vbar = Scrollbar(master, name="vbar") self.vbar = vbar = Scrollbar(frame, name="vbar")
vbar.pack(side="right", fill="y") vbar.pack(side="right", fill="y")
self.canvas = canvas = Canvas(master, self.canvas = canvas = Canvas(frame,
height=min(300, max(40, height)), height=min(300, max(40, height)),
scrollregion=(0, 0, width, height)) scrollregion=(0, 0, width, height))
canvas.pack(side="left", fill="both", expand=1) canvas.pack(side="left", fill="both", expand=1)
@ -210,34 +217,43 @@ class NamespaceViewer:
canvas["yscrollcommand"] = vbar.set canvas["yscrollcommand"] = vbar.set
self.subframe = subframe = Frame(canvas) self.subframe = subframe = Frame(canvas)
self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw") self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw")
names = dict.keys() self.load_dict(dict)
names.sort()
row = 0 def load_dict(self, dict):
for name in names: subframe = self.subframe
value = dict[name] frame = self.frame
svalue = self.repr.repr(value) # repr(value) for c in subframe.children.values():
l = Label(subframe, text=name) c.destroy()
l.grid(row=row, column=0, sticky="nw") if not dict:
## l = Label(subframe, text=svalue, justify="l", wraplength=300) l = Label(subframe, text="None")
l = Entry(subframe, width=0, borderwidth=0) l.grid(row=0, column=0)
l.insert(0, svalue) else:
## l["state"] = "disabled" names = dict.keys()
l.grid(row=row, column=1, sticky="nw") names.sort()
row = row+1 row = 0
for name in names:
value = dict[name]
svalue = self.repr.repr(value) # repr(value)
l = Label(subframe, text=name)
l.grid(row=row, column=0, sticky="nw")
## l = Label(subframe, text=svalue, justify="l", wraplength=300)
l = Entry(subframe, width=0, borderwidth=0)
l.insert(0, svalue)
## l["state"] = "disabled"
l.grid(row=row, column=1, sticky="nw")
row = row+1
# XXX Could we use a <Configure> callback for the following?
subframe.update_idletasks() # Alas! subframe.update_idletasks() # Alas!
width = subframe.winfo_reqwidth() width = subframe.winfo_reqwidth()
height = subframe.winfo_reqheight() height = subframe.winfo_reqheight()
canvas["scrollregion"] = (0, 0, width, height) canvas = self.canvas
## if height > 300: self.canvas["scrollregion"] = (0, 0, width, height)
## canvas["height"] = 300 if height > 300:
## master.pack(expand=1) canvas["height"] = 300
## else: frame.pack(expand=1)
## canvas["height"] = height else:
## master.pack(expand=0) canvas["height"] = height
frame.pack(expand=0)
def close(self): def close(self):
for c in self.subframe, self.label, self.vbar, self.canvas: self.frame.destroy()
try:
c.destroy()
except:
pass