changeset:   99947:59852a79b508
branch:      3.5
parent:      99944:31e6d4d25b8e
user:        Terry Jan Reedy <tjreedy@udel.edu>
date:        Sat Jan 16 23:44:04 2016 -0500
files:       Lib/idlelib/CREDITS.txt Lib/idlelib/aboutDialog.py
description:
Issue #25905: Specify 'ascii' encoding for README.txt and NEWS.txt.
Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'.


diff -r 31e6d4d25b8e -r 59852a79b508 Lib/idlelib/CREDITS.txt
--- a/Lib/idlelib/CREDITS.txt	Sat Jan 16 18:43:24 2016 -0800
+++ b/Lib/idlelib/CREDITS.txt	Sat Jan 16 23:44:04 2016 -0500
@@ -24,7 +24,7 @@
 integration, debugger integration and persistent breakpoints).
 
 Scott David Daniels, Tal Einat, Hernan Foffani, Christos Georgiou,
-Jim Jewett, Martin v. Löwis, Jason Orendorff, Guilherme Polo, Josh Robb,
+Jim Jewett, Martin v. Löwis, Jason Orendorff, Guilherme Polo, Josh Robb,
 Nigel Rowe, Bruce Sherwood, Jeff Shute, and Weeble have submitted useful
 patches.  Thanks, guys!
 
diff -r 31e6d4d25b8e -r 59852a79b508 Lib/idlelib/aboutDialog.py
--- a/Lib/idlelib/aboutDialog.py	Sat Jan 16 18:43:24 2016 -0800
+++ b/Lib/idlelib/aboutDialog.py	Sat Jan 16 23:44:04 2016 -0500
@@ -111,6 +111,7 @@
                                 command=self.ShowIDLECredits)
         idle_credits_b.pack(side=LEFT, padx=10, pady=10)
 
+    # License, et all, are of type _sitebuiltins._Printer
     def ShowLicense(self):
         self.display_printer_text('About - License', license)
 
@@ -120,14 +121,16 @@
     def ShowPythonCredits(self):
         self.display_printer_text('About - Python Credits', credits)
 
+    # Encode CREDITS.txt to utf-8 for proper version of Loewis.
+    # Specify others as ascii until need utf-8, so catch errors.
     def ShowIDLECredits(self):
-        self.display_file_text('About - Credits', 'CREDITS.txt', 'iso-8859-1')
+        self.display_file_text('About - Credits', 'CREDITS.txt', 'utf-8')
 
     def ShowIDLEAbout(self):
-        self.display_file_text('About - Readme', 'README.txt')
+        self.display_file_text('About - Readme', 'README.txt', 'ascii')
 
     def ShowIDLENEWS(self):
-        self.display_file_text('About - NEWS', 'NEWS.txt')
+        self.display_file_text('About - NEWS', 'NEWS.txt', 'ascii')
 
     def display_printer_text(self, title, printer):
         printer._Printer__setup()