summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-12-14 23:03:31 (GMT)
committerNed Deily <nad@acm.org>2011-12-14 23:03:31 (GMT)
commit1b0b6ae36bfdf01a34c040a8ee8e4d9926c7443f (patch)
treee9bd7fd078324699f410db63f16479a8c1f6bdc7 /Lib
parent77e1bfc3777a318232e0816c4a9a15fc7955d80d (diff)
parentf505b7425c1e46e847dfc1e4528bc178af06b085 (diff)
downloadcpython-1b0b6ae36bfdf01a34c040a8ee8e4d9926c7443f.zip
cpython-1b0b6ae36bfdf01a34c040a8ee8e4d9926c7443f.tar.gz
cpython-1b0b6ae36bfdf01a34c040a8ee8e4d9926c7443f.tar.bz2
Issue #4625: If IDLE cannot write to its recent file or breakpoint
files, display a message popup and continue rather than crash. (original patch by Roger Serwy)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/EditorWindow.py15
-rw-r--r--Lib/idlelib/PyShell.py24
2 files changed, 26 insertions, 13 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index d77f0a4..203a195 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -799,12 +799,17 @@ 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',
- encoding='utf_8', errors='replace')
try:
- rf_file.writelines(rf_list)
- finally:
- rf_file.close()
+ with open(self.recent_files_path, 'w',
+ encoding='utf_8', errors='replace') as rf_file:
+ rf_file.writelines(rf_list)
+ except IOError as err:
+ if not getattr(self.root, "recentfilelist_error_displayed", False):
+ self.root.recentfilelist_error_displayed = True
+ tkMessageBox.showerror(title='IDLE Error',
+ message='Unable to update Recent Files list:\n%s'
+ % str(err),
+ parent=self.text)
# for each edit window instance, construct the recent files menu
for instance in self.top.instance_dict:
menu = instance.recent_files_menu
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index ea3a5d9..86e4eed 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -206,14 +206,22 @@ class PyShellEditorWindow(EditorWindow):
lines = fp.readlines()
except IOError:
lines = []
- with open(self.breakpointPath, "w") as new_file:
- for line in lines:
- if not line.startswith(filename + '='):
- new_file.write(line)
- self.update_breakpoints()
- breaks = self.breakpoints
- if breaks:
- new_file.write(filename + '=' + str(breaks) + '\n')
+ try:
+ with open(self.breakpointPath, "w") as new_file:
+ for line in lines:
+ if not line.startswith(filename + '='):
+ new_file.write(line)
+ self.update_breakpoints()
+ breaks = self.breakpoints
+ if breaks:
+ new_file.write(filename + '=' + str(breaks) + '\n')
+ except IOError as err:
+ if not getattr(self.root, "breakpoint_error_displayed", False):
+ self.root.breakpoint_error_displayed = True
+ tkMessageBox.showerror(title='IDLE Error',
+ message='Unable to update breakpoint list:\n%s'
+ % str(err),
+ parent=self.text)
def restore_file_breaks(self):
self.text.update() # this enables setting "BREAK" tags to be visible