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

[terry.reedy]

https://hg.python.org/cpython/rev/cad65e43c717
changeset:   98198:cad65e43c717
parent:      98194:c548859fd591
parent:      98197:ab08ec59c706
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Sep 22 21:13:53 2015 -0400
summary:
  Merge with 3.5

files:
  Lib/idlelib/PyShell.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1547,7 +1547,7 @@
     root.withdraw()
     flist = PyShellFileList(root)
     macosxSupport.setupApp(root, flist)
-    
+
     if macosxSupport.isAquaTk():
         # There are some screwed up <2> class bindings for text
         # widgets defined in Tk which we need to do away with.

-- 
Repository URL: https://hg.python.org/cpython