Merge lp:~adiroiban/pocket-lint/923309 into lp:pocket-lint

[Adi Roiban]

This is my take on implementing a more flexible pocket-lint for checking line length.

Please let me know if you want this configuration to be implemented in a different way.

Maybe this will require a few lines in the documentation/README

I am currently using it in the following way:

    from pocketlint.formatcheck import (
        BaseChecker,
        check_sources,
        PythonChecker,
        )

    # Patch checkers.
    BaseChecker.check_length_filter = lambda self: 78
    PythonChecker.check_length_filter = lambda self: 78

[Curtis Hovey (sinzui)]

I have already merged your changes in to my branch.

I then factored out the link_length check from the python checker because pep8. pep8 users the check_length_filter to determine if it needs to override the default. I am presently adding a command line arg (--max-length) that will be used by check_length_filter.

review: Approve (code)

=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py	2012-01-29 18:30:41 +0000
+++ pocketlint/formatcheck.py	2012-01-29 20:25:28 +0000
@@ -215,7 +215,6 @@
 
     The Decedent must provide self.file_name and self.base_dir
     """
-
     def __init__(self, file_path, text, reporter=None):
         self.file_path = file_path
         self.base_dir = os.path.dirname(file_path)
@@ -244,6 +243,13 @@
         """Check the content."""
         raise NotImplementedError
 
+    def check_length_filter(self):
+        '''Default filter used by default for checking line lengt.'''
+        if '/lib/lp/' in self.file_path:
+            return 78
+        else:
+            return 80
+
 
 class UniversalChecker(BaseChecker):
     """Check and reformat doctests."""
@@ -288,11 +294,10 @@
 
     def check_length(self, line_no, line):
         """Check the length of the line."""
-        if '/lib/lp/' in self.file_path:
-            max_length = 78
-        else:
-            max_length = 80
-        if len(line) > max_length:
+
+        max_length = self.check_length_filter()
+
+        if max_length and len(line) > max_length:
             self.message(
                 line_no, 'Line exceeds %s characters.' % max_length,
                 icon='info')
@@ -546,8 +551,7 @@
             self.check_pdb(line_no, line)
             self.check_conflicts(line_no, line)
             self.check_ascii(line_no, line)
-            if '/lib/lp/' in self.file_path:
-                self.check_length(line_no, line)
+            self.check_length(line_no, line)
 
     def check_pdb(self, line_no, line):
         """Check the length of the line."""
@@ -565,6 +569,12 @@
             line = line.decode('utf-8')
         super(PythonChecker, self).check_length(line_no, line)
 
+    def check_length_filter(self):
+        '''Default filter used by default for checking line lengt.'''
+        if '/lib/lp/' not in self.file_path:
+            return False
+        return super(PythonChecker, self).check_length_filter()
+
     def check_ascii(self, line_no, line):
         """Check that the line is ascii."""
         if self.encoding != 'ascii':