misc: merge with sytle checker fix

Oops.
This commit is contained in:
Jason Lowe-Power 2016-07-01 10:37:57 -05:00
commit 7c291677a8

View file

@ -272,7 +272,8 @@ class Whitespace(LineVerifier):
if c == ' ': if c == ' ':
newline += ' ' newline += ' '
elif c == '\t': elif c == '\t':
newline += ' ' * (tabsize - len(newline) % tabsize) newline += ' ' * (style.tabsize - \
len(newline) % style.tabsize)
else: else:
newline += line[i:] newline += line[i:]
break break
@ -349,7 +350,7 @@ class ControlSpace(LineVerifier):
return not (match and match.group(2) != " ") return not (match and match.group(2) != " ")
def fix_line(self, line, **kwargs): def fix_line(self, line, **kwargs):
new_line = _any_control.sub(r'\1 (', line) new_line = ControlSpace._any_control.sub(r'\1 (', line)
return new_line return new_line