[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5
terry.reedy
python-checkins at python.org
Sat Jan 16 23:44:43 EST 2016
https://hg.python.org/cpython/rev/e48bd90262b5
changeset: 99948:e48bd90262b5
parent: 99945:6636d688bbd3
parent: 99947:59852a79b508
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Jan 16 23:44:16 2016 -0500
summary:
Merge with 3.5
files:
Lib/idlelib/CREDITS.txt | 2 +-
Lib/idlelib/aboutDialog.py | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt
--- a/Lib/idlelib/CREDITS.txt
+++ b/Lib/idlelib/CREDITS.txt
@@ -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 --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py
--- a/Lib/idlelib/aboutDialog.py
+++ b/Lib/idlelib/aboutDialog.py
@@ -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()
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list