mirror of https://github.com/python/cpython
Some syntax errors were being caught by tokenize during the tabnanny
check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719
This commit is contained in:
parent
54c3db55a2
commit
c426ffcdfc
|
@ -3,6 +3,10 @@ What's New in IDLE 2.6a1?
|
|||
|
||||
*Release date: XX-XXX-200X*
|
||||
|
||||
- Some syntax errors were being caught by tokenize during the tabnanny
|
||||
check, resulting in obscure error messages. Do the syntax check
|
||||
first. Bug 1562716, 1562719
|
||||
|
||||
- IDLE's version number takes a big jump to match the version number of
|
||||
the Python release of which it's a part.
|
||||
|
||||
|
|
|
@ -57,9 +57,10 @@ class ScriptBinding:
|
|||
filename = self.getfilename()
|
||||
if not filename:
|
||||
return
|
||||
if not self.checksyntax(filename):
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
self.checksyntax(filename)
|
||||
|
||||
def tabnanny(self, filename):
|
||||
f = open(filename, 'r')
|
||||
|
@ -76,9 +77,6 @@ class ScriptBinding:
|
|||
self.editwin.gotoline(nag.get_lineno())
|
||||
self.errorbox("Tab/space error", indent_message)
|
||||
return False
|
||||
except IndentationError:
|
||||
# From tokenize(), let compile() in checksyntax find it again.
|
||||
pass
|
||||
return True
|
||||
|
||||
def checksyntax(self, filename):
|
||||
|
@ -139,11 +137,11 @@ class ScriptBinding:
|
|||
filename = self.getfilename()
|
||||
if not filename:
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
code = self.checksyntax(filename)
|
||||
if not code:
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
shell = self.shell
|
||||
interp = shell.interp
|
||||
if PyShell.use_subprocess:
|
||||
|
|
Loading…
Reference in New Issue