mirror of https://github.com/python/cpython.git
Make CREDITS.txt a Latin-1 file. Extend ViewFile to support file encodings.
This commit is contained in:
parent
04b9d47941
commit
424a415951
|
@ -22,7 +22,7 @@ Other contributors include Raymond Hettinger, Tony Lownds (Mac integration),
|
|||
Neal Norwitz (code check and clean-up), and Chui Tey (RPC integration, debugger
|
||||
integration and persistent breakpoints).
|
||||
|
||||
Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff, Noam
|
||||
Hernan Foffani, Christos Georgiou, Martin v. Löwis, Jason Orendorff, Noam
|
||||
Raphael, Josh Robb, Nigel Rowe, and Bruce Sherwood have submitted useful
|
||||
patches. Thanks, guys!
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ def ShowPythonCredits(self):
|
|||
self.display_printer_text(credits, 'About - Python Credits')
|
||||
|
||||
def ShowIDLECredits(self):
|
||||
self.ViewFile('About - Credits','CREDITS.txt')
|
||||
self.ViewFile('About - Credits','CREDITS.txt', 'iso-8859-1')
|
||||
|
||||
def ShowIDLEAbout(self):
|
||||
self.ViewFile('About - Readme', 'README.txt')
|
||||
|
@ -131,9 +131,22 @@ def display_printer_text(self, printer, title):
|
|||
data = '\n'.join(printer._Printer__lines)
|
||||
textView.TextViewer(self, title, None, data)
|
||||
|
||||
def ViewFile(self,viewTitle,viewFile):
|
||||
def ViewFile(self, viewTitle, viewFile, encoding=None):
|
||||
fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),viewFile)
|
||||
textView.TextViewer(self,viewTitle,fn)
|
||||
if encoding:
|
||||
import codecs
|
||||
try:
|
||||
textFile = codecs.open(fn, 'r')
|
||||
except IOError:
|
||||
tkMessageBox.showerror(title='File Load Error',
|
||||
message='Unable to load file '+
|
||||
`fileName`+' .')
|
||||
return
|
||||
else:
|
||||
data = textFile.read()
|
||||
else:
|
||||
data = None
|
||||
textView.TextViewer(self, viewTitle, fn, data=data)
|
||||
|
||||
def Ok(self, event=None):
|
||||
self.destroy()
|
||||
|
|
Loading…
Reference in New Issue