From cb5852d1f7a45dcb3c8a56120ba16b2c1825c990 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 8 Jan 2009 02:16:13 +0000 Subject: [PATCH] Be sure to ignore the end-of-line character when considering trailing whitespace. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61905 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lint/common_lint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/lint/common_lint.py b/utils/lint/common_lint.py index 95670316654..18263838b09 100644 --- a/utils/lint/common_lint.py +++ b/utils/lint/common_lint.py @@ -15,7 +15,7 @@ def VerifyLineLength(filename, lines, max_length): """ line_num = 1 for line in lines: - length = len(line.rstrip()) # strip off EOL char(s) + length = len(line.rstrip()) if length > max_length: print '%s:%d:Line exceeds %d chars (%d)' % (filename, line_num, max_length, length) @@ -32,7 +32,7 @@ def VerifyTrailingWhitespace(filename, lines): trailing_whitespace_re = re.compile(r'\s+$') line_num = 1 for line in lines: - if trailing_whitespace_re.match(line): + if trailing_whitespace_re.match(line.rstrip()): print '%s:%d:Trailing whitespace' % (filename, line_num) line_num += 1 -- 2.34.1