mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
IDLE: fix some RessourceWarning, reuse tokenize.open()
This commit is contained in:
parent
0af0306396
commit
85c6772aec
2 changed files with 28 additions and 31 deletions
|
@ -201,18 +201,18 @@ class PyShellEditorWindow(EditorWindow):
|
|||
breaks = self.breakpoints
|
||||
filename = self.io.filename
|
||||
try:
|
||||
lines = open(self.breakpointPath,"r").readlines()
|
||||
with open(self.breakpointPath, "r") as fp:
|
||||
lines = fp.readlines()
|
||||
except IOError:
|
||||
lines = []
|
||||
new_file = open(self.breakpointPath,"w")
|
||||
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')
|
||||
new_file.close()
|
||||
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')
|
||||
|
||||
def restore_file_breaks(self):
|
||||
self.text.update() # this enables setting "BREAK" tags to be visible
|
||||
|
@ -220,7 +220,8 @@ class PyShellEditorWindow(EditorWindow):
|
|||
if filename is None:
|
||||
return
|
||||
if os.path.isfile(self.breakpointPath):
|
||||
lines = open(self.breakpointPath,"r").readlines()
|
||||
with open(self.breakpointPath, "r") as fp:
|
||||
lines = fp.readlines()
|
||||
for line in lines:
|
||||
if line.startswith(filename + '='):
|
||||
breakpoint_linenumbers = eval(line[len(filename)+1:])
|
||||
|
@ -571,7 +572,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
def execfile(self, filename, source=None):
|
||||
"Execute an existing file"
|
||||
if source is None:
|
||||
source = open(filename, "r").read()
|
||||
with open(filename, "r") as fp:
|
||||
source = fp.read()
|
||||
try:
|
||||
code = compile(source, filename, "exec")
|
||||
except (OverflowError, SyntaxError):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue