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

Wed Sep 23 09:46:07 CEST 2015

https://hg.python.org/cpython/rev/728c9d896b21
changeset: 98212:728c9d896b21
branch: 3.5
parent: 98209:b6698c00265b
parent: 98211:e7f5ecfd86fc
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Sep 23 03:45:33 2015 -0400
summary:
 Merge with 3.4
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
@@ -234,7 +234,7 @@
 with open(src, 'rb') as inn,\
 open(dst, 'wb') as out:
 for line in inn:
- out.write(line.rstrip() + '\n')
+ out.write(line.rstrip() + b'\n')
 print('idle.html copied to help.html')
 
 def show_idlehelp(parent):
-- 
Repository URL: https://hg.python.org/cpython
