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)
........
This commit is contained in:
Ned Deily 2011-01-24 22:22:06 +00:00
parent e2248f9e6d
commit ab5dd00927
2 changed files with 7 additions and 2 deletions

View File

@ -773,7 +773,8 @@ class EditorWindow(object):
"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 @@ class EditorWindow(object):
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:

View File

@ -37,6 +37,9 @@ Core and Builtins
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.