[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Tue Aug 18 19:28:17 CEST 2015

https://hg.python.org/cpython/rev/80b3930b86ef
changeset: 97442:80b3930b86ef
parent: 97438:0ff1acc89cf0
parent: 97441:01d91caa58b6
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Aug 18 13:27:30 2015 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/StackViewer.py | 8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/StackViewer.py
--- a/Lib/idlelib/StackViewer.py
+++ b/Lib/idlelib/StackViewer.py
@@ -10,8 +10,7 @@
 
 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 @@
 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:
-- 
Repository URL: https://hg.python.org/cpython
