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

Thu Aug 27 19:03:36 CEST 2015

https://hg.python.org/cpython/rev/8270cf851d04
changeset: 97527:8270cf851d04
branch: 3.5
parent: 97523:9db2a3139255
parent: 97526:213ae5626493
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Thu Aug 27 13:02:27 2015 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/StackViewer.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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