Merge lp:~adiroiban/pocket-lint/pep-in-memory into lp:pocket-lint

[Adi Roiban]

Description
----------

To allow in memory check of pep8 code , pocket-lint should pass already parsed lines to pep8 instead of only passing the filepath so that a file is only read once.

Changes
-------

I have updated check_pep8

I have updated tests to use the new PocketLintOptions object and stop using the mocked Bunch object.

I have updated the max_line_lenght update in PocketLintOption to keep in sync the pep8 option.

I have updated style so that pocket-lint code will pass pocket-lint checks.

Maybe we should update test.py to also run pocket-lint on the pocket-lint source code? What do you think? I can do that in separate branch. This can also be usefull for travis-ci integration.

Please let me know what do you think.

Unmerged revisions

453. By Adi Roiban <email address hidden> on 2014-04-12

Initial code to fix pep8 in memory check.

=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py	2014-03-09 21:04:28 +0000
+++ pocketlint/formatcheck.py	2014-04-12 16:02:11 +0000
@@ -265,8 +265,8 @@
     """Default options used by pocketlint"""
 
     def __init__(self, command_options=None):
-        self.max_line_length = 0
-
+        self._max_line_length = 0
+        self.regex_line = []
         self.jslint = {
             'enabled': True,
             }
@@ -290,6 +290,15 @@
         if command_options:
             self._updateFromCommandLineOptions(command_options)
 
+    @property
+    def max_line_length(self):
+        return self._max_line_length
+
+    @max_line_length.setter
+    def max_line_length(self, value):
+        self._max_line_length = value
+        self.pep8['max_line_length'] = value - 1
+
     def _updateFromCommandLineOptions(self, options):
         """
         Update with options received from command line.
@@ -734,7 +743,11 @@
         pep8_report = PEP8Report(options, self.message)
         try:
             pep8_checker = pep8.Checker(
-                self.file_path, options=options, report=pep8_report)
+                filename=self.file_path,
+                lines=self.text.splitlines(True),
+                options=options,
+                report=pep8_report,
+                )
             pep8_checker.check_all()
         except TokenError as er:
             message, location = er.args

=== modified file 'pocketlint/tests/test_python.py'
--- pocketlint/tests/test_python.py	2014-03-09 21:00:26 +0000
+++ pocketlint/tests/test_python.py	2014-04-12 16:02:11 +0000
@@ -5,17 +5,16 @@
     absolute_import,
     print_function,
     unicode_literals,
-)
+    )
 
 import unittest
 from tempfile import NamedTemporaryFile
 
 from pocketlint.formatcheck import (
-    get_option_parser,
     # Imported via pocketlint to avoid duplication of conditional import.
     pep257,
-    PythonChecker,
-)
+    PocketLintOptions, PythonChecker,
+    )
 from pocketlint.tests import CheckerTestCase
 from pocketlint.tests.test_text import TestAnyTextMixin
 
@@ -171,7 +170,7 @@
         source = (
             '# -*- coding: utf-8 -*-\n'
             'variable = u"r\xe9sum\xe9"'
-        )
+            )
         checker = PythonChecker('bogus', source, self.reporter)
         # This should set the correct encoding.
         checker.check_text()
@@ -183,33 +182,23 @@
 class TestPEP8(CheckerTestCase):
     """Verify PEP8 integration."""
 
-    def setUp(self):
-        super(TestPEP8, self).setUp()
-        self.file = NamedTemporaryFile(prefix='pocketlint_')
-
-    def tearDown(self):
-        self.file.close()
-
     def test_code_without_issues(self):
-        self.write_to_file(self.file, good_python)
         checker = PythonChecker(
-            self.file.name, good_python, self.reporter)
+            'file/path', good_python, self.reporter)
         checker.check_pep8()
         self.assertEqual([], self.reporter.messages)
 
     def test_bad_syntax(self):
-        self.write_to_file(self.file, bad_syntax2_python)
         checker = PythonChecker(
-            self.file.name, ugly_style_python, self.reporter)
+            'file/path', ugly_style_python, self.reporter)
         checker.check_pep8()
         self.assertEqual(
-            [(4, 'E901 TokenError: EOF in multi-line statement')],
+            [(4, 'E222 multiple spaces after operator')],
             self.reporter.messages)
 
     def test_code_with_IndentationError(self):
-        self.write_to_file(self.file, bad_indentation_python)
         checker = PythonChecker(
-            self.file.name, bad_indentation_python, self.reporter)
+            'file/path', bad_indentation_python, self.reporter)
         checker.check_pep8()
         expected = [(
             4,
@@ -219,9 +208,8 @@
         checker.check_pep8()
 
     def test_code_closing_bracket(self):
-        self.write_to_file(self.file, hanging_style_python)
         checker = PythonChecker(
-            self.file.name, hanging_style_python, self.reporter)
+            'file/path', hanging_style_python, self.reporter)
         checker.options.pep8['hang_closing'] = True
         checker.check_pep8()
         self.assertEqual([], self.reporter.messages)
@@ -233,32 +221,28 @@
             self.reporter.messages)
 
     def test_code_with_issues(self):
-        self.write_to_file(self.file, ugly_style_python)
         checker = PythonChecker(
-            self.file.name, ugly_style_python, self.reporter)
+            'file/path', ugly_style_python, self.reporter)
         checker.check_pep8()
         self.assertEqual(
             [(4, 'E222 multiple spaces after operator')],
             self.reporter.messages)
 
     def test_code_with_comments(self):
-        self.write_to_file(self.file, ugly_style_lines_python)
         checker = PythonChecker(
-            self.file.name, ugly_style_lines_python, self.reporter)
+            'file/path', ugly_style_lines_python, self.reporter)
         checker.check_pep8()
         self.assertEqual([], self.reporter.messages)
 
     def test_long_length_good(self):
         long_line = '1234 56189' * 7 + '12345678' + '\n'
-        self.write_to_file(self.file, long_line)
-        checker = PythonChecker(self.file.name, long_line, self.reporter)
+        checker = PythonChecker('file/path', long_line, self.reporter)
         checker.check_pep8()
         self.assertEqual([], self.reporter.messages)
 
     def test_long_length_bad(self):
         long_line = '1234 56189' * 8 + '\n'
-        self.write_to_file(self.file, long_line)
-        checker = PythonChecker(self.file.name, long_line, self.reporter)
+        checker = PythonChecker('file/path', long_line, self.reporter)
         checker.check_pep8()
         self.assertEqual(
             [(1, 'E501 line too long (80 > 79 characters)')],
@@ -266,11 +250,10 @@
 
     def test_long_length_options(self):
         long_line = '1234 56189' * 7 + '\n'
-        parser = get_option_parser()
-        (options, sources) = parser.parse_args(['-m', '60'])
-        self.write_to_file(self.file, long_line)
+        options = PocketLintOptions()
+        options.max_line_length = 60
         checker = PythonChecker(
-            self.file.name, long_line, self.reporter, options)
+            'file/path', long_line, self.reporter, options)
         checker.check_pep8()
         self.assertEqual(
             [(1, 'E501 line too long (70 > 59 characters)')],
@@ -322,8 +305,7 @@
     def test_pep8_options(self):
         """It can set PEP8 options."""
         long_line = '1234 56189' * 7 + '\n'
-        self.write_to_file(self.file, long_line)
-        checker = PythonChecker(self.file.name, long_line, self.reporter)
+        checker = PythonChecker('file/path', long_line, self.reporter)
         checker.options.pep8['ignore'] = ['E501']
         checker.options.pep8['max_line_length'] = 60
         checker.check_pep8()
@@ -346,7 +328,7 @@
             [(1, 'All modules should have docstrings.'),
              (3, 'First line should end with a period.'), ],
             self.reporter.messages,
-        )
+            )
 
     def test_code_with_ignore(self):
         """A list with error message which should be ignored can be
@@ -364,7 +346,7 @@
         self.assertEqual(
             [(1, 'All modules should have docstrings.'), ],
             self.reporter.messages,
-        )
+            )
 
 
 class TestText(CheckerTestCase, TestAnyTextMixin):

=== modified file 'pocketlint/tests/test_text.py'
--- pocketlint/tests/test_text.py	2014-03-09 21:00:26 +0000
+++ pocketlint/tests/test_text.py	2014-04-12 16:02:11 +0000
@@ -5,12 +5,12 @@
     absolute_import,
     print_function,
     unicode_literals,
-)
+    )
 
 from pocketlint.formatcheck import (
     AnyTextChecker,
     get_option_parser,
-)
+    )
 from pocketlint.tests import Bunch, CheckerTestCase
 
 
@@ -71,7 +71,8 @@
             regex_line=[
                 ('.*marker.*', 'Explanation.'),
                 ('.*sign.*', 'Message.'),
-                ])
+                ],
+            )
 
         self.create_and_check(
             'bogus',