fixup! Allow usage of pylint via stdin

Author: mpanarin

pyls/plugins/pylint_lint.py

@@ -169,7 +169,9 @@ def pyls_lint(config, document, is_saved):
     """Run pylint linter."""
     settings = config.plugin_settings('pylint')
     log.debug("Got pylint settings: %s", settings)
-    if settings.get('executable'):
+    # pylint >= 2.5.0 is required for working through stdin and only
+    # available with python3
+    if settings.get('executable') and sys.version_info[0] >= 3:
         flags = build_args_stdio(settings)
         pylint_executable = settings.get('executable', 'pylint')
         return pylint_lint_stdin(pylint_executable, document, flags)

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import sys
 from setuptools import find_packages, setup
 import versioneer
 
@@ -53,7 +54,9 @@
             'pycodestyle>=2.6.0,<2.7.0',
             'pydocstyle>=2.0.0',
             'pyflakes>=2.2.0,<2.3.0',
-            'pylint>=2.5.0',
+            # pylint >= 2.5.0 is required for working through stdin and only
+            # available with python3
+            'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint',
             'rope>=0.10.5',
             'yapf',
         ],
@@ -63,12 +66,14 @@
         'pycodestyle': ['pycodestyle>=2.6.0,<2.7.0'],
         'pydocstyle': ['pydocstyle>=2.0.0'],
         'pyflakes': ['pyflakes>=2.2.0,<2.3.0'],
-        'pylint': ['pylint>=2.5.0'],
+        'pylint': [
+            'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint'],
         'rope': ['rope>0.10.5'],
         'yapf': ['yapf'],
-        'test': ['versioneer', 'pylint>=2.5.0', 'pytest', 'mock', 'pytest-cov',
-                 'coverage', 'numpy', 'pandas', 'matplotlib',
-                 'pyqt5;python_version>="3"'],
+        'test': ['versioneer',
+                 'pylint>=2.5.0' if sys.version_info.major >= 3 else 'pylint',
+                 'pytest', 'mock', 'pytest-cov', 'coverage', 'numpy', 'pandas',
+                 'matplotlib', 'pyqt5;python_version>="3"'],
     },
 
     # To provide executable scripts, use entry points in preference to the

test/plugins/test_pylint_lint.py

@@ -3,7 +3,7 @@
 import os
 import tempfile
 
-from test import py2_only, py3_only
+from test import py2_only, py3_only, IS_PY3
 from pyls import lsp, uris
 from pyls.workspace import Document
 from pyls.plugins import pylint_lint
@@ -49,15 +49,19 @@ def test_pylint(config, workspace):
         assert unused_import['range']['start'] == {'line': 0, 'character': 0}
         assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
 
-        # test running pylint in stdin
-        config.plugin_settings('pylint')['executable'] = 'pylint'
-        diags = pylint_lint.pyls_lint(config, doc, True)
+        if IS_PY3:
+            # test running pylint in stdin
+            config.plugin_settings('pylint')['executable'] = 'pylint'
+            diags = pylint_lint.pyls_lint(config, doc, True)
 
-        msg = 'Unused import sys (unused-import)'
-        unused_import = [d for d in diags if d['message'] == msg][0]
+            msg = 'Unused import sys (unused-import)'
+            unused_import = [d for d in diags if d['message'] == msg][0]
 
-        assert unused_import['range']['start'] == {'line': 0, 'character': 0}
-        assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
+            assert unused_import['range']['start'] == {
+                'line': 0,
+                'character': 0,
+            }
+            assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
 
 
 @py3_only
@@ -90,14 +94,6 @@ def test_syntax_error_pylint_py2(config, workspace):
         assert diag['range']['start'] == {'line': 0, 'character': 0}
         assert diag['severity'] == lsp.DiagnosticSeverity.Error
 
-        # test running pylint in stdin
-        config.plugin_settings('pylint')['executable'] = 'pylint'
-
-        assert diag['message'].startswith('invalid syntax')
-        # Pylint doesn't give column numbers for invalid syntax.
-        assert diag['range']['start'] == {'line': 0, 'character': 0}
-        assert diag['severity'] == lsp.DiagnosticSeverity.Error
-
 
 def test_lint_free_pylint(config, workspace):
     # Can't use temp_document because it might give us a file that doesn't

vscode-client/package.json

@@ -262,7 +262,7 @@
                 "pyls.plugins.pylint.executable": {
                   "type": "string",
                   "default": null,
-                  "description": "Executable to run pylint with. Enabling this will run pylint on unsaved files via stdin. Can slow down workflow."
+                  "description": "Executable to run pylint with. Enabling this will run pylint on unsaved files via stdin. Can slow down workflow. Only works with python3."
                 },
                 "pyls.plugins.rope_completion.enabled": {
                     "type": "boolean",