diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2016-01-17 04:44:16 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2016-01-17 04:44:16 (GMT) |
| commit | ab061cf2aec2bd1440066dc5238e95d3aee7fd9f (patch) | |
| tree | 53a330d66c366dd270655f282545aa29778e8080 /Lib/idlelib | |
| parent | a8a3a1b7e80cb4863f8e2ce28bb6e860f70839fb (diff) | |
| parent | 356765194c8b2a8774864510b0ace66ffef12b01 (diff) | |
| download | cpython-ab061cf2aec2bd1440066dc5238e95d3aee7fd9f.zip cpython-ab061cf2aec2bd1440066dc5238e95d3aee7fd9f.tar.gz cpython-ab061cf2aec2bd1440066dc5238e95d3aee7fd9f.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/CREDITS.txt | 2 | ||||
| -rw-r--r-- | Lib/idlelib/aboutDialog.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt index 5ff599d..3a50eb8 100644 --- a/Lib/idlelib/CREDITS.txt +++ b/Lib/idlelib/CREDITS.txt @@ -24,7 +24,7 @@ Noam Raphael (Code Context, Call Tips, many other patches), and Chui Tey (RPC 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 index d876a97..3112e6a 100644 --- a/Lib/idlelib/aboutDialog.py +++ b/Lib/idlelib/aboutDialog.py @@ -111,6 +111,7 @@ class AboutDialog(Toplevel): 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 @@ class AboutDialog(Toplevel): 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() |