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

[Adi Roiban]

Hi,

This is my merge proposal for this bug.

I know that users should not be encouraged to ignore pyflakes messages ... but sometimes I just want to shoot myself in the foot without pyflakes complaining about it.

The ignore is valid only for Python and only for pyflakes messages.

Not sure if this should be a general python ignore and have # pocket-lint:ignore

Cheers,
Adi

[Curtis Hovey (sinzui)]

I can merge this after some variable names are made consistent with the module:
    s/filename='(none)'/file_page='(none)'/
    s/line_nr/line_no/

review: Needs Fixing (code)

[lp:~adiroiban/pocket-lint/907742]

466. By Adi Roiban on 2012-04-20

Use line_no and file_path to be consistent with the module.

467. By Adi Roiban on 2012-04-20

Addapt pyflakeschecker.

[Adi Roiban (adiroiban)]

Hi,

Thanks for the comment.
I have updated and push the changes required for using line_no and file_path.

Adi

review: Needs Resubmitting

[lp:~adiroiban/pocket-lint/907742]

468. By Adi Roiban on 2012-04-20

Use file_path instead of file_name.

[Adi Roiban (adiroiban)]

review: Abstain

[Curtis Hovey (sinzui)]

Thank you. I have merged this.

review: Approve (code)

=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py	2012-02-02 13:32:30 +0000
+++ pocketlint/formatcheck.py	2012-04-20 16:56:19 +0000
@@ -73,6 +73,28 @@
     This is here to work around some of the pyflakes problems.
     '''
 
+    def __init__(self, tree, file_path='(none)', text=None):
+        self.text = text
+        if self.text:
+            self.text = self.text.split('\n')
+        super(PocketLintPyFlakesChecker, self).__init__(
+            tree=tree, filename=file_path)
+
+    @property
+    def file_path(self):
+        '''Alias for consistency with the rest of pocketlint.'''
+        return self.filename
+
+    def report(self, messageClass, *args, **kwargs):
+        '''Filter some errors not used in our project.'''
+        line_no = args[0] - 1
+
+        # Ignore explicit pyflakes:ignore requests.
+        if self.text and self.text[line_no].find('pyflakes:ignore') >= 0:
+            return
+
+        self.messages.append(messageClass(self.file_path, *args, **kwargs))
+
     def NAME(self, node):
         '''Locate name. Ignore WindowsErrors.'''
         if node.id == 'WindowsError':
@@ -513,7 +535,8 @@
             message = '%s: %s' % (explanation, line.strip())
             self.message(line_no, message, icon='error')
         else:
-            warnings = PocketLintPyFlakesChecker(tree, self.file_path)
+            warnings = PocketLintPyFlakesChecker(
+                tree, file_path=self.file_path, text=self.text)
             for warning in warnings.messages:
                 dummy, line_no, message = str(warning).split(':')
                 self.message(int(line_no), message.strip(), icon='error')

=== modified file 'pocketlint/tests/test_python.py'
--- pocketlint/tests/test_python.py	2012-01-29 21:24:20 +0000
+++ pocketlint/tests/test_python.py	2012-04-20 16:56:19 +0000
@@ -136,6 +136,17 @@
             self.reporter.messages)
         self.assertEqual(2, self.reporter.call_count)
 
+    def test_pyflakes_ignore(self):
+        pyflakes_ignore = (
+            'def something():\n'
+            '    unused_variable = 1  # pyflakes:ignore\n'
+            )
+        self.reporter.call_count = 0
+        checker = PythonChecker('bogus', pyflakes_ignore, self.reporter)
+        checker.check_flakes()
+        self.assertEqual([], self.reporter.messages)
+        self.assertEqual(0, self.reporter.call_count)
+
 
 class TestPEP8(CheckerTestCase):
     """Verify PEP8 integration."""