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

[terry.reedy]

https://hg.python.org/cpython/rev/2c3f9b7b457d
changeset:   98167:2c3f9b7b457d
parent:      98163:09ebed6a8cb8
parent:      98166:9a66286b970c
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Sep 21 22:42:55 2015 -0400
summary:
  Merge with 3.5

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


diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -242,7 +242,7 @@
     filename = join(abspath(dirname(__file__)), 'help.html')
     if not isfile(filename):
         # try copy_strip, present message
-        return 
+        return
     HelpWindow(parent, filename, 'IDLE Help')
 
 if __name__ == '__main__':

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