Address some of the linter issues (#125)

gitlint/__init__.py

@@ -193,7 +193,7 @@ def main(argv, stdout=sys.stdout, stderr=sys.stderr):
             stdout = codecs.getwriter("utf-8")(stdout)
         if stderr == sys.stderr:
             stderr = codecs.getwriter("utf-8")(stderr)
-        linesep = unicode(os.linesep)
+        linesep = unicode(os.linesep)  # pylint: disable=undefined-variable
 
     arguments = docopt.docopt(
         __doc__, argv=argv[1:], version='git-lint v%s' % __VERSION__)

gitlint/configs/pylintrc

@@ -12,7 +12,7 @@ profile=no
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=CVS,.git
+ignore=CVS,.git,.hg,.eggs
 
 # Pickle collected data for later comparisons.
 persistent=no
@@ -244,7 +244,7 @@ max-args=8
 
 # Argument names that match this expression will be ignored. Default to name
 # with leading underscore
-ignored-argument-names=_.*
+ignored-argument-names=(unused)?_[a-z_][a-z0-9_]+
 
 # Maximum number of locals for function / method body
 max-locals=15

gitlint/linters.py

@@ -38,8 +38,8 @@ def __repr__(self):
             (self.func.__name__, self.args, self.keywords))  # pragma: no cover
 
 
-def missing_requirements_command(unused_name, missing_programs,
-                                 installation_string, filename, unused_lines):
+def missing_requirements_command(missing_programs, installation_string,
+                                 filename, unused_lines):
     """Pseudo-command to be used when requirements are missing."""
     verb = 'is'
     if len(missing_programs) > 1:
@@ -146,7 +146,7 @@ def parse_yaml_config(yaml_config, repo_home):
         not_found_programs = utils.programs_not_in_path([command] +
                                                         requirements)
         if not_found_programs:
-            linter_command = Partial(missing_requirements_command, name,
+            linter_command = Partial(missing_requirements_command,
                                      not_found_programs, data['installation'])
         else:
             linter_command = Partial(lint_command, name, command, arguments,

test/e2etest/test_e2e.py

@@ -23,6 +23,17 @@
 # pylint: disable=too-many-public-methods
 
 
+def get_linter_output(linter_name, file_path):
+    cache_path = os.path.expanduser('~/.git-lint/cache')
+    filename = os.path.join(cache_path, linter_name, file_path[1:])
+    if not os.path.exists(filename):
+        return 'No git-lint cache found for %s' % filename
+
+    with open(filename) as f:
+        output = f.read()
+    return output
+
+
 class E2EMixin(object):
     """Mixin holding the actual end to end tests.
 
@@ -62,7 +73,7 @@ def tearDown(self):
         if self.filename_repo is None:
             return
 
-        with open(self.filename_repo, 'w') as f:
+        with open(self.filename_repo, 'w'):
             pass
         self.add(self.filename_repo)
         self.commit('Commit teardown')
@@ -81,16 +92,6 @@ def test_extension_not_defined(self):
         self.assertIn('SKIPPED', output)
         self.assertIn(extension, output)
 
-    def get_linter_output(self, linter_name, file_path):
-        cache_path = os.path.expanduser('~/.git-lint/cache')
-        filename = os.path.join(cache_path, linter_name, file_path[1:])
-        if not os.path.exists(filename):
-            return 'No git-lint cache found for %s' % filename
-
-        with open(filename) as f:
-            output = f.read()
-        return output
-
     # TODO(skreft): check that the first file has more than 1 error, check that
     # the second file has 1 new error, check also the lines that changed.
     def assert_linter_works(self, linter_name, extension):
@@ -135,7 +136,7 @@ def assert_linter_works(self, linter_name, extension):
             0, response,
             ('Git lint for file %s should have failed.\n git-lint output: %s' +
              '\nLinter Output:\n%s') % (filename_error, output,
-                                        self.get_linter_output(
+                                        get_linter_output(
                                             linter_name, filename_repo)))
         self.add(filename_repo)
         self.commit('Commit 2')

test/unittest/test_linters.py

@@ -344,7 +344,7 @@ def test_lint_extension_not_defined(self):
         self.assertEqual({'foo.txt': {'skipped': []}}, output)
 
     def test_lint_missing_programs(self):
-        linter1 = functools.partial(linters.missing_requirements_command, 'l1',
+        linter1 = functools.partial(linters.missing_requirements_command,
                                     ['p1', 'p2'], 'Install p1 and p2')
         config = {'.txt': [linter1]}
         output = linters.lint('foo.txt', lines=[4, 5], config=config)
@@ -353,7 +353,7 @@ def test_lint_missing_programs(self):
         self.assertEqual({'foo.txt': {'skipped': []}}, output)
 
     def test_lint_two_missing_programs(self):
-        linter1 = functools.partial(linters.missing_requirements_command, 'l1',
+        linter1 = functools.partial(linters.missing_requirements_command,
                                     ['p1', 'p2'], 'Install p1 and p2')
         config = {'.txt': [linter1, linter1]}
         output = linters.lint('foo.txt', lines=[4, 5], config=config)