[Python-checkins] r82058 - in python/branches/release31-maint: Lib/idlelib/textView.py Misc/NEWS

[victor.stinner]

Author: victor.stinner
Date: Thu Jun 17 23:45:56 2010
New Revision: 82058

Log:
Merged revisions 82057 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82057 | victor.stinner | 2010-06-17 23:43:33 +0200 (jeu., 17 juin 2010) | 2 lines
  
  Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/idlelib/textView.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/idlelib/textView.py
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/textView.py	(original)
+++ python/branches/release31-maint/Lib/idlelib/textView.py	Thu Jun 17 23:45:56 2010
@@ -62,11 +62,7 @@
 
 def view_file(parent, title, filename, encoding=None):
     try:
-        if encoding:
-            import codecs
-            textFile = codecs.open(filename, 'r')
-        else:
-            textFile = open(filename, 'r')
+        textFile = open(filename, 'r', encoding=encoding)
     except IOError:
         import tkinter.messagebox as tkMessageBox
         tkMessageBox.showerror(title='File Load Error',

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Jun 17 23:45:56 2010
@@ -66,6 +66,8 @@
 Library
 -------
 
+- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument.
+
 - Issue #8720: fix regression caused by fix for #4050 by making getsourcefile
   smart enough to find source files in the linecache.