From 4c52b625b379b9321c086d31395f06482aec37b8 Mon Sep 17 00:00:00 2001 From: Francisco Paez Date: Thu, 21 Nov 2013 22:22:22 -0300 Subject: [PATCH] Fixes #318 Fix from https://bitbucket.org/logilab/pylint/issue/55/. --- pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py b/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py index bf53234a..3c89a484 100644 --- a/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py +++ b/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py @@ -355,7 +355,7 @@ def check_lines(self, lines, i): self.add_message('C0304', line=i) else: stripped_line = line.rstrip() - if line != stripped_line + '\n': + if line[len(stripped_line):] not in ('\n', '\r\n'): self.add_message('C0303', line=i) # Don't count excess whitespace in the line length. line = stripped_line