From 4c4c9525439812a72d0495fa3d4472854bcc4e47 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Fri, 20 Feb 2009 22:28:45 +0000 Subject: Only strip the newline character at the end of the lines that we're considering for length and for trailing whitespace; otherwise, the whitespace themselves will also be removed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65182 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lint/common_lint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/lint/common_lint.py b/utils/lint/common_lint.py index 18263838b0..e08c93cb17 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()) + length = len(line.rstrip('\n')) 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.rstrip()): + if trailing_whitespace_re.match(line.rstrip('\n')): print '%s:%d:Trailing whitespace' % (filename, line_num) line_num += 1 -- cgit v1.2.3