Issue #18151: Replace remaining Idle 'open...close' pairs with 'with open'.

This commit is contained in:
Terry Jan Reedy 2013-08-04 15:39:56 -04:00
parent b671701149
commit f948943604
3 changed files with 7 additions and 14 deletions

View File

@ -894,11 +894,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')
try:
with open(self.recent_files_path, 'r') as rf_list_file:
rf_list = rf_list_file.readlines()
finally:
rf_list_file.close()
if new_file:
new_file = os.path.abspath(new_file) + '\n'
if new_file in rf_list:

View File

@ -248,9 +248,8 @@ class IOBinding:
try:
# open the file in binary mode so that we can handle
# end-of-line convention ourselves.
f = open(filename,'rb')
chars = f.read()
f.close()
with open(filename, 'rb') as f:
chars = f.read()
except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
return False
@ -383,10 +382,8 @@ class IOBinding:
if self.eol_convention != "\n":
chars = chars.replace("\n", self.eol_convention)
try:
f = open(filename, "wb")
f.write(chars)
f.flush()
f.close()
with open(filename, "wb") as f:
f.write(chars)
return True
except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg),

View File

@ -87,9 +87,8 @@ class ScriptBinding:
self.shell = shell = self.flist.open_shell()
saved_stream = shell.get_warning_stream()
shell.set_warning_stream(shell.stderr)
f = open(filename, 'r')
source = f.read()
f.close()
with open(filename, 'r') as f:
source = f.read()
if '\r' in source:
source = re.sub(r"\r\n", "\n", source)
source = re.sub(r"\r", "\n", source)