summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Lowe-Power <powerjg@cs.wisc.edu>2016-07-01 10:37:57 -0500
committerJason Lowe-Power <powerjg@cs.wisc.edu>2016-07-01 10:37:57 -0500
commit7c291677a842c16fe61296dcfa67556a20dda479 (patch)
tree8ba1d37f65a64bfb349ca1fc28f6089cb7dd16c6
parent134824e84725fca8d9e46c012e674e551babef28 (diff)
parent57e3f401006567f8cfd113133a6ba2518f7ee9c2 (diff)
downloadgem5-7c291677a842c16fe61296dcfa67556a20dda479.tar.xz
misc: merge with sytle checker fix
Oops.
-rw-r--r--util/style/verifiers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/util/style/verifiers.py b/util/style/verifiers.py
index b798f5553..8a02db1a1 100644
--- 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