Skip to content

Commit 594bf8a

Browse files
committed
remove testing Python 2 cruft
1 parent 58249bb commit 594bf8a

File tree

2 files changed

+11
-29
lines changed

2 files changed

+11
-29
lines changed

test/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# Copyright 2017-2020 Palantir Technologies, Inc.
22
# Copyright 2021- Python Language Server Contributors.
33

4-
import sys
54
import pytest
65
from pylsp import IS_WIN
76

8-
IS_PY3 = sys.version_info.major == 3
97

108
unix_only = pytest.mark.skipif(IS_WIN, reason="Unix only")
119
windows_only = pytest.mark.skipif(not IS_WIN, reason="Windows only")
12-
py3_only = pytest.mark.skipif(not IS_PY3, reason="Python3 only")
13-
py2_only = pytest.mark.skipif(IS_PY3, reason="Python2 only")

test/plugins/test_pylint_lint.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import sys
88
import tempfile
99

10-
from test import py2_only, py3_only, IS_PY3
1110
from pylsp import lsp, uris
1211
from pylsp.workspace import Document
1312
from pylsp.plugins import pylint_lint
@@ -53,23 +52,21 @@ def test_pylint(config, workspace):
5352
assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
5453
assert unused_import['tags'] == [lsp.DiagnosticTag.Unnecessary]
5554

56-
if IS_PY3:
57-
# test running pylint in stdin
58-
config.plugin_settings('pylint')['executable'] = 'pylint'
59-
diags = pylint_lint.pylsp_lint(config, doc, True)
55+
# test running pylint in stdin
56+
config.plugin_settings('pylint')['executable'] = 'pylint'
57+
diags = pylint_lint.pylsp_lint(config, doc, True)
6058

61-
msg = 'Unused import sys (unused-import)'
62-
unused_import = [d for d in diags if d['message'] == msg][0]
59+
msg = 'Unused import sys (unused-import)'
60+
unused_import = [d for d in diags if d['message'] == msg][0]
6361

64-
assert unused_import['range']['start'] == {
65-
'line': 0,
66-
'character': 0,
67-
}
68-
assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
62+
assert unused_import['range']['start'] == {
63+
'line': 0,
64+
'character': 0,
65+
}
66+
assert unused_import['severity'] == lsp.DiagnosticSeverity.Warning
6967

7068

71-
@py3_only
72-
def test_syntax_error_pylint_py3(config, workspace):
69+
def test_syntax_error_pylint(config, workspace):
7370
with temp_document(DOC_SYNTAX_ERR, workspace) as doc:
7471
diag = pylint_lint.pylsp_lint(config, doc, True)[0]
7572

@@ -92,17 +89,6 @@ def test_syntax_error_pylint_py3(config, workspace):
9289
assert diag['severity'] == lsp.DiagnosticSeverity.Error
9390

9491

95-
@py2_only
96-
def test_syntax_error_pylint_py2(config, workspace):
97-
with temp_document(DOC_SYNTAX_ERR, workspace) as doc:
98-
diag = pylint_lint.pylsp_lint(config, doc, True)[0]
99-
100-
assert diag['message'].startswith('[syntax-error] invalid syntax')
101-
# Pylint doesn't give column numbers for invalid syntax.
102-
assert diag['range']['start'] == {'line': 0, 'character': 0}
103-
assert diag['severity'] == lsp.DiagnosticSeverity.Error
104-
105-
10692
def test_lint_free_pylint(config, workspace):
10793
# Can't use temp_document because it might give us a file that doesn't
10894
# match pylint's naming requirements. We should be keeping this file clean

0 commit comments

Comments
 (0)