Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2016-01-16 23:44:16 -05:00
parent a8a3a1b7e8 356765194c
commit ab061cf2ae
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/CREDITS.txt
View File

@ -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!

9
Lib/idlelib/aboutDialog.py
View File

@ -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()