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

diff --git a/utils/lint/common_lint.py b/utils/lint/common_lint.py
index 18263838b09b84ea1fb055d6c895e0b7b133115b..e08c93cb17011337d0a33a7224a2b7be4d2d52cf 100644 (file)
--- 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