summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-06-22 07:57:32 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-06-22 07:57:32 (GMT)
commitb8a79ae812d64cd5a0de64a2d7fe6b3dd32c34b4 (patch)
tree85258c0183573b7607ac87e045dfc5857d583ac3 /Lib/idlelib
parentec51eb7b2503681a3846f04a22e80fe635e957b6 (diff)
parent6ff7a14b914dc1a456c122da75b60cbb613ab31d (diff)
downloadcpython-b8a79ae812d64cd5a0de64a2d7fe6b3dd32c34b4.zip
cpython-b8a79ae812d64cd5a0de64a2d7fe6b3dd32c34b4.tar.gz
cpython-b8a79ae812d64cd5a0de64a2d7fe6b3dd32c34b4.tar.bz2
Issue #27365: Merge minimal part.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/NEWS.txt4
-rw-r--r--Lib/idlelib/help_about.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 68a555c..84dbf15 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -58,7 +58,7 @@ What's New in IDLE 3.6.0?
Original patch by Saimadhav Heblikar.
- Issue #18410: Add test for IDLE's search dialog.
- Original patch by Westley Martínez.
+ Original patch by Westley Martínez.
- Issue #21703: Add test for undo delegator. Patch mostly by
Saimadhav Heblikar .
@@ -76,7 +76,7 @@ What's New in IDLE 3.6.0?
- Issue #25507: fix incorrect change in IOBinding that prevented printing.
Augment IOBinding htest to include all major IOBinding functions.
-- Issue #25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION
+- Issue #25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION
MARK in README.txt and open this and NEWS.txt with 'ascii'.
Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'.
diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index 4b6c528..362dcbb 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -130,7 +130,7 @@ class AboutDialog(Toplevel):
self.display_file_text('About - Readme', 'README.txt', 'ascii')
def ShowIDLENEWS(self):
- self.display_file_text('About - NEWS', 'NEWS.txt', 'ascii')
+ self.display_file_text('About - NEWS', 'NEWS.txt', 'utf-8')
def display_printer_text(self, title, printer):
printer._Printer__setup()