summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-08-18 17:27:30 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-08-18 17:27:30 (GMT)
commit4a8dc5899836ecc4020395b35daebe2cfbdf11ef (patch)
tree789618cfce6739d4d85cc5226436b7f2d9692560
parent7a0eadc6d5aea200e4b24c658b9a07ed30ee7452 (diff)
parentf5e0c41d6d143b16af4b9d97d5ce39eaa9e32df3 (diff)
downloadcpython-4a8dc5899836ecc4020395b35daebe2cfbdf11ef.zip
cpython-4a8dc5899836ecc4020395b35daebe2cfbdf11ef.tar.gz
cpython-4a8dc5899836ecc4020395b35daebe2cfbdf11ef.tar.bz2
Merge with 3.5
-rw-r--r--Lib/idlelib/StackViewer.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/StackViewer.py
index b1e5e26..36507ee 100644
--- a/Lib/idlelib/StackViewer.py
+++ b/Lib/idlelib/StackViewer.py
@@ -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: