mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-09 18:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

IDLE: fix some RessourceWarning, reuse tokenize.open()

Browse source
This commit is contained in:
Victor Stinner 2011-09-02 00:57:04 +02:00
parent 0af0306396
commit 85c6772aec
2 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/idlelib/PyShell.py
View file

@ -201,18 +201,18 @@ class PyShellEditorWindow(EditorWindow):
breaks = self.breakpoints breaks = self.breakpoints
filename = self.io.filename filename = self.io.filename
try: try:
lines = open(self.breakpointPath,"r").readlines() with open(self.breakpointPath, "r") as fp:
lines = fp.readlines()
except IOError: except IOError:
lines = [] lines = []
new_file = open(self.breakpointPath,"w") with open(self.breakpointPath, "w") as new_file:
for line in lines: for line in lines:
if not line.startswith(filename + '='): if not line.startswith(filename + '='):
new_file.write(line) new_file.write(line)
self.update_breakpoints() self.update_breakpoints()
breaks = self.breakpoints breaks = self.breakpoints
if breaks: if breaks:
new_file.write(filename + '=' + str(breaks) + '\n') new_file.write(filename + '=' + str(breaks) + '\n')
new_file.close()
def restore_file_breaks(self): def restore_file_breaks(self):
self.text.update() # this enables setting "BREAK" tags to be visible self.text.update() # this enables setting "BREAK" tags to be visible
@ -220,7 +220,8 @@ class PyShellEditorWindow(EditorWindow):
if filename is None: if filename is None:
return return
if os.path.isfile(self.breakpointPath): 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: for line in lines:
if line.startswith(filename + '='): if line.startswith(filename + '='):
breakpoint_linenumbers = eval(line[len(filename)+1:]) breakpoint_linenumbers = eval(line[len(filename)+1:])
@ -571,7 +572,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
def execfile(self, filename, source=None): def execfile(self, filename, source=None):
"Execute an existing file" "Execute an existing file"
if source is None: if source is None:
source = open(filename, "r").read() with open(filename, "r") as fp:
source = fp.read()
try: try:
code = compile(source, filename, "exec") code = compile(source, filename, "exec")
except (OverflowError, SyntaxError): except (OverflowError, SyntaxError):

33
Lib/idlelib/ScriptBinding.py
View file

@ -67,25 +67,20 @@ class ScriptBinding:
def tabnanny(self, filename): def tabnanny(self, filename):
# XXX: tabnanny should work on binary files as well # XXX: tabnanny should work on binary files as well
with open(filename, 'r', encoding='iso-8859-1') as f: with tokenize.open(filename) as f:
two_lines = f.readline() + f.readline() try:
encoding = IOBinding.coding_spec(two_lines) tabnanny.process_tokens(tokenize.generate_tokens(f.readline))
if not encoding: except tokenize.TokenError as msg:
encoding = 'utf-8' msgtxt, (lineno, start) = msg
f = open(filename, 'r', encoding=encoding) self.editwin.gotoline(lineno)
try: self.errorbox("Tabnanny Tokenizing Error",
tabnanny.process_tokens(tokenize.generate_tokens(f.readline)) "Token Error: %s" % msgtxt)
except tokenize.TokenError as msg: return False
msgtxt, (lineno, start) = msg except tabnanny.NannyNag as nag:
self.editwin.gotoline(lineno) # The error messages from tabnanny are too confusing...
self.errorbox("Tabnanny Tokenizing Error", self.editwin.gotoline(nag.get_lineno())
"Token Error: %s" % msgtxt) self.errorbox("Tab/space error", indent_message)
return False return False
except tabnanny.NannyNag as nag:
# The error messages from tabnanny are too confusing...
self.editwin.gotoline(nag.get_lineno())
self.errorbox("Tab/space error", indent_message)
return False
return True return True
def checksyntax(self, filename): def checksyntax(self, filename):