misc: merge with sytle checker fix

Oops.
2016-07-01 10:37:57 -05:00
parent 134824e847 57e3f40100
commit 7c291677a8
1 changed files with 3 additions and 2 deletions
--- a/util/style/verifiers.py
+++ b/util/style/verifiers.py
@@ -272,7 +272,8 @@ class Whitespace(LineVerifier):
                if c == ' ':
                    newline += ' '
                elif c == '\t':
-                    newline += ' ' * (tabsize - len(newline) % tabsize)
+                    newline += ' ' * (style.tabsize - \
+                                      len(newline) % style.tabsize)
                else:
                    newline += line[i:]
                    break
@@ -349,7 +350,7 @@ class ControlSpace(LineVerifier):
        return not (match and match.group(2) != " ")

    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