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

Thu Aug 27 05:38:28 CEST 2015

https://hg.python.org/cpython/rev/a150c7158ff2
changeset: 97524:a150c7158ff2
parent: 97520:669f10ed5080
parent: 97523:9db2a3139255
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Aug 26 23:37:47 2015 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/StackViewer.py | 3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/StackViewer.py
--- a/Lib/idlelib/StackViewer.py
+++ b/Lib/idlelib/StackViewer.py
@@ -120,6 +120,9 @@
 sublist.append(item)
 return sublist
 
+ def keys(self): # unused, left for possible 3rd parcy use
+ return list(self.object.keys())
+
 def _stack_viewer(parent):
 root = tk.Tk()
 root.title("Test StackViewer")
-- 
Repository URL: https://hg.python.org/cpython
