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

[ned.deily]

Author: ned.deily
Date: Mon Jan 24 23:22:06 2011
New Revision: 88177

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

........
  r88174 | ned.deily | 2011-01-24 13:46:44 -0800 (Mon, 24 Jan 2011) | 6 lines
  
  #10974: IDLE no longer crashes if its recent files list includes files
          with non-ASCII characters in their path names.
  
          (with approval of release manager for 3.2rc2)
........


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

Modified: python/branches/release31-maint/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/release31-maint/Lib/idlelib/EditorWindow.py	Mon Jan 24 23:22:06 2011
@@ -773,7 +773,8 @@
         "Load and update the recent files list and menus"
         rf_list = []
         if os.path.exists(self.recent_files_path):
-            rf_list_file = open(self.recent_files_path,'r')
+            rf_list_file = open(self.recent_files_path,'r',
+                                encoding='utf_8', errors='replace')
             try:
                 rf_list = rf_list_file.readlines()
             finally:
@@ -791,7 +792,8 @@
         rf_list = [path for path in rf_list if path not in bad_paths]
         ulchars = "1234567890ABCDEFGHIJK"
         rf_list = rf_list[0:len(ulchars)]
-        rf_file = open(self.recent_files_path, 'w')
+        rf_file = open(self.recent_files_path, 'w',
+                        encoding='utf_8', errors='replace')
         try:
             rf_file.writelines(rf_list)
         finally:

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Jan 24 23:22:06 2011
@@ -37,6 +37,9 @@
 Library
 -------
 
+- Issue #10974: IDLE no longer crashes if its recent files list includes files
+  with non-ASCII characters in their path names.
+
 - Issue #10987: Fix the recursion limit handling in the _pickle module.
 
 - Issue #10949: Improved robustness of rotating file handlers.