Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-08-18 13:27:18 -04:00
commit f5e0c41d6d
1 changed files with 2 additions and 6 deletions

View File

@ -10,8 +10,7 @@ from idlelib.PyShell import PyShellFileList
def StackBrowser(root, flist=None, tb=None, top=None):
if top is None:
from tkinter import Toplevel
top = Toplevel(root)
top = tk.Toplevel(root)
sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
sc.frame.pack(expand=1, fill="both")
item = StackTreeItem(flist, tb)
@ -108,12 +107,9 @@ class VariablesTreeItem(ObjectTreeItem):
def IsExpandable(self):
return len(self.object) > 0
def keys(self):
return list(self.object.keys())
def GetSubList(self):
sublist = []
for key in self.keys():
for key in self.object.keys():
try:
value = self.object[key]
except KeyError: