mirror of https://github.com/python/cpython.git
Issue #18151: Replace remaining Idle 'open...close' pairs with 'with open'.
This commit is contained in:
parent
c86d7e989c
commit
95f34ab959
|
@ -882,12 +882,9 @@ def update_recent_files_list(self, new_file=None):
|
|||
"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',
|
||||
encoding='utf_8', errors='replace')
|
||||
try:
|
||||
with open(self.recent_files_path, 'r',
|
||||
encoding='utf_8', errors='replace') 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:
|
||||
|
|
|
@ -208,11 +208,10 @@ def loadfile(self, filename):
|
|||
try:
|
||||
# open the file in binary mode so that we can handle
|
||||
# end-of-line convention ourselves.
|
||||
f = open(filename,'rb')
|
||||
two_lines = f.readline() + f.readline()
|
||||
f.seek(0)
|
||||
bytes = f.read()
|
||||
f.close()
|
||||
with open(filename, 'rb') as f:
|
||||
two_lines = f.readline() + f.readline()
|
||||
f.seek(0)
|
||||
bytes = f.read()
|
||||
except OSError as msg:
|
||||
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
|
||||
return False
|
||||
|
@ -373,10 +372,8 @@ def writefile(self, filename):
|
|||
text = text.replace("\n", self.eol_convention)
|
||||
chars = self.encode(text)
|
||||
try:
|
||||
f = open(filename, "wb")
|
||||
f.write(chars)
|
||||
f.flush()
|
||||
f.close()
|
||||
with open(filename, "wb") as f:
|
||||
f.write(chars)
|
||||
return True
|
||||
except OSError as msg:
|
||||
tkMessageBox.showerror("I/O Error", str(msg),
|
||||
|
|
|
@ -87,9 +87,8 @@ def checksyntax(self, filename):
|
|||
self.shell = shell = self.flist.open_shell()
|
||||
saved_stream = shell.get_warning_stream()
|
||||
shell.set_warning_stream(shell.stderr)
|
||||
f = open(filename, 'rb')
|
||||
source = f.read()
|
||||
f.close()
|
||||
with open(filename, 'rb') as f:
|
||||
source = f.read()
|
||||
if b'\r' in source:
|
||||
source = source.replace(b'\r\n', b'\n')
|
||||
source = source.replace(b'\r', b'\n')
|
||||
|
|
Loading…
Reference in New Issue