From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 11 Nov 2016 17:03:09 +0000 (-0500)
Subject: Issue #27854: Include idlelib/help.html in 2.7 Windows installer.
X-Git-Tag: v2.7.13rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30b51c9224b4adf5b1645dc496c297f76f6ccebd;p=thirdparty%2FPython%2Fcpython.git

Issue #27854: Include idlelib/help.html in 2.7 Windows installer.
Without this file, clicking Help => IDLE Help did nothing.
---

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 3053234f65d8..35e2a7ecce2b 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -2,6 +2,12 @@ What's New in IDLE 2.7.13?
 ==========================
 *Release date: 2017-01-01?*
 
+- Issue #27854: Make Help => IDLE Help work again on Windows.
+  Include idlelib/help.html in 2.7 Windows installer.
+
+- Issue #25507: Add back import needed for 2.x encoding warning box.
+  Add pointer to 'Encoding declaration' in Language Reference.
+
 - Issue #15308: Add 'interrupt execution' (^C) to Shell menu.
   Patch by Roger Serwy, updated by Bayard Randel.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index d136f2b12961..3834e3865693 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -220,6 +220,12 @@ Library
 IDLE
 ----
 
+- Issue #27854: Make Help => IDLE Help work again on Windows.
+  Include idlelib/help.html in 2.7 Windows installer.
+
+- Issue #25507: Add back import needed for 2.x encoding warning box.
+  Add pointer to 'Encoding declaration' in Language Reference.
+
 - Issue #15308: Add 'interrupt execution' (^C) to Shell menu.
   Patch by Roger Serwy, updated by Bayard Randel.
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index b3a5b13e475b..65ce5c153cff 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1076,6 +1076,7 @@ def add_files(db):
         if dir=='idlelib':
             lib.glob("*.def")
             lib.add_file("idle.bat")
+            lib.add_file("help.html")
         if dir=="Icons":
             lib.glob("*.gif")
             lib.glob("*.ico")