mirror of https://github.com/python/cpython.git
Report first line with inconsistent tab usage.
This commit is contained in:
parent
031c6315e2
commit
3db0e3713c
|
@ -51,10 +51,10 @@ def check(file):
|
||||||
print "%s: Token Error: %s" % (`file`, str(msg))
|
print "%s: Token Error: %s" % (`file`, str(msg))
|
||||||
|
|
||||||
if verbose > 1:
|
if verbose > 1:
|
||||||
print "checking", `file`, "with tabsize 4..."
|
print "checking", `file`, "with tabsize 1..."
|
||||||
f.seek(0)
|
f.seek(0)
|
||||||
alttokens = []
|
alttokens = []
|
||||||
tokenize.tabsize = 4
|
tokenize.tabsize = 1
|
||||||
try:
|
try:
|
||||||
tokenize.tokenize(f.readline, alttokens.append)
|
tokenize.tokenize(f.readline, alttokens.append)
|
||||||
except tokenize.TokenError, msg:
|
except tokenize.TokenError, msg:
|
||||||
|
@ -62,10 +62,30 @@ def check(file):
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
if tokens != alttokens:
|
if tokens != alttokens:
|
||||||
|
badline = 0
|
||||||
|
n, altn = len(tokens), len(alttokens)
|
||||||
|
for i in range(max(n, altn)):
|
||||||
|
if i >= n:
|
||||||
|
x = None
|
||||||
|
else:
|
||||||
|
x = tokens[i]
|
||||||
|
if i >= altn:
|
||||||
|
y = None
|
||||||
|
else:
|
||||||
|
y = alttokens[i]
|
||||||
|
if x != y:
|
||||||
|
if x:
|
||||||
|
kind, token, start, end, line = x
|
||||||
|
else:
|
||||||
|
kind, token, start, end, line = y
|
||||||
|
badline = start[0]
|
||||||
|
break
|
||||||
if verbose:
|
if verbose:
|
||||||
print "%s: *** Trouble in tab city! ***" % `file`
|
print "%s: *** Line %d: trouble in tab city! ***" % (
|
||||||
|
`file`, badline)
|
||||||
|
print "offending line:", `line`
|
||||||
else:
|
else:
|
||||||
print file
|
print file, badline, `line`
|
||||||
else:
|
else:
|
||||||
if verbose:
|
if verbose:
|
||||||
print "%s: Clean bill of health." % `file`
|
print "%s: Clean bill of health." % `file`
|
||||||
|
|
Loading…
Reference in New Issue