Make CREDITS.txt a Latin-1 file. Extend ViewFile to support file encodings.

diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt
index 62e2f8ddc1e96f951e1d6ab6a9db5986ae420ac1..fe775768f3d08276a6045c6d0e460b7748a3fbe0 100644 (file)
--- a/Lib/idlelib/CREDITS.txt
+++ b/Lib/idlelib/CREDITS.txt
@@ -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!
 

diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py
index 94dd6cbf0a5252fef331dfe9cb1b95874bf5f2e8..d88cfcc226742a3f10f47c519327260194ee6e61 100644 (file)
--- a/Lib/idlelib/aboutDialog.py
+++ b/Lib/idlelib/aboutDialog.py
@@ -118,7 +118,7 @@ class AboutDialog(Toplevel):
         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 @@ class AboutDialog(Toplevel):
         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()