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

[terry.reedy]

https://hg.python.org/cpython/rev/9db2a3139255
changeset:   97523:9db2a3139255
branch:      3.5
parent:      97519:4141984cf362
parent:      97522:eec5e81b38d1
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Aug 26 23:37:31 2015 -0400
summary:
  Merge with 3.4

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