Merge lp:~adiroiban/pocket-lint/1085490-windows-new-lines into lp:pocket-lint

[Adi Roiban]

Here are the changes for adding windows newline checks.

The windows endline checks were added for all types.

There is no option to turn off the ckeck for Windows newlines.

Please let me know if you think that this check should be disabled by default or requires command line options.

Thanks!

[Curtis Hovey (sinzui)]

Thank you. I will merge the branch.

review: Approve (code)

=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py	2012-04-25 13:09:13 +0000
+++ pocketlint/formatcheck.py	2012-12-02 00:45:25 +0000
@@ -346,6 +346,12 @@
             self.message(
                 line_no, 'Line contains a tab character.', icon='info')
 
+    def check_windows_endlines(self):
+        """Check that file does not contains Windows newlines."""
+        if self.text.find('\r\n') != -1:
+            self.message(
+                0, 'File contains Windows new lines.', icon='info')
+
 
 class AnyTextChecker(BaseChecker, AnyTextMixin):
     """Verify the text of the document."""
@@ -358,6 +364,8 @@
             self.check_trailing_whitespace(line_no, line)
             self.check_conflicts(line_no, line)
 
+        self.check_windows_endlines()
+
 
 class SQLChecker(BaseChecker, AnyTextMixin):
     """Verify SQL style."""
@@ -372,6 +380,8 @@
             self.check_tab(line_no, line)
             self.check_conflicts(line_no, line)
 
+        self.check_windows_endlines()
+
 
 class XMLChecker(BaseChecker, AnyTextMixin):
     """Check XML documents."""
@@ -423,6 +433,7 @@
                 error_lineno = int(location.split(',')[0].split()[1]) - offset
             self.message(error_lineno, error_message, icon='error')
         self.check_text()
+        self.check_windows_endlines()
 
     def check_text(self):
         for line_no, line in enumerate(self.text.splitlines()):
@@ -477,6 +488,7 @@
 
         self.check_cssutils()
         self.check_text()
+        self.check_windows_endlines()
         # CSS coding conventoins checks should go last since they rely
         # on previous checks.
         self.check_css_coding_conventions()
@@ -526,6 +538,7 @@
         self.check_text()
         self.check_flakes()
         self.check_pep8()
+        self.check_windows_endlines()
 
     def check_flakes(self):
         """Check compilation and syntax."""
@@ -633,6 +646,7 @@
                 line_no -= 1
                 self.message(line_no, message, icon='error')
         self.check_text()
+        self.check_windows_endlines()
 
     def check_debugger(self, line_no, line):
         """Check the length of the line."""
@@ -669,6 +683,7 @@
         """Check the syntax of the reStructuredText code."""
         self.check_lines()
         self.check_empty_last_line()
+        self.check_windows_endlines()
 
     def check_lines(self):
         """Call each line checker for each line in text."""
 
=== modified file 'pocketlint/tests/test_text.py'
--- pocketlint/tests/test_text.py	2012-01-29 21:24:20 +0000
+++ pocketlint/tests/test_text.py	2012-12-02 00:45:25 +0000
@@ -75,3 +75,16 @@
         self.assertEqual(
             [(1, 'Line exceeds 49 characters.')],
             self.reporter.messages)
+
+    def test_windows_newlines(self):
+        """
+        Files with Windows newlines are reported with errors.
+        """
+        content = '\r\nbla\r\nbla\r\n'
+        checker = AnyTextChecker(
+            'bogus', content, self.reporter)
+        checker.check()
+        self.assertEqual(
+            [(0, 'File contains Windows new lines.')],
+            self.reporter.messages)
+        self.assertEqual(1, self.reporter.call_count)