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 3053234f65d890a9bba66c467b113b56f57894a9..35e2a7ecce2b6e34e2fb725cd79510015f623fa2 100644 (file)
--- 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 d136f2b12961d4de0e9274a673546b3f4a939dce..3834e3865693489470722c173ce8347b60d2c00b 100644 (file)
--- 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 b3a5b13e475b20f2e4213cdeba23d3577ea809f4..65ce5c153cfff86b9bc46d1ece6d26c025b99766 100644 (file)
--- 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")