1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
From f6d9041b81d142657985b696d8da82cebdbe00bb Mon Sep 17 00:00:00 2001
From: krassowski <krassowski.michal@gmail.com>
Date: Sun, 25 Apr 2021 21:06:28 +0100
Subject: [PATCH 1/2] Address pylint's "consider-using-with" warnings
---
pylsp/plugins/flake8_lint.py | 25 +++++++++++++++----------
pylsp/plugins/pylint_lint.py | 28 ++++++++++++++++------------
test/plugins/test_flake8_lint.py | 7 +++----
test/plugins/test_pylint_lint.py | 7 +++----
4 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
index d632395..dfee5b4 100644
--- a/pylsp/plugins/flake8_lint.py
+++ b/pylsp/plugins/flake8_lint.py
@@ -5,6 +5,7 @@
import logging
import os.path
import re
+from contextlib import ExitStack
from subprocess import Popen, PIPE
from pylsp import hookimpl, lsp
@@ -65,16 +66,20 @@ def run_flake8(flake8_executable, args, document):
)
log.debug("Calling %s with args: '%s'", flake8_executable, args)
- try:
- cmd = [flake8_executable]
- cmd.extend(args)
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- except IOError:
- log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
- cmd = ['python', '-m', 'flake8']
- cmd.extend(args)
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- (stdout, stderr) = p.communicate(document.source.encode())
+ with ExitStack() as stack:
+ try:
+ cmd = [flake8_executable]
+ cmd.extend(args)
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ stack.enter_context(p)
+ except IOError:
+ log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
+ cmd = ['python', '-m', 'flake8']
+ cmd.extend(args)
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ stack.enter_context(p)
+ # exit stack ensures that even if an exception happens, the process `p` will be properly terminated
+ (stdout, stderr) = p.communicate(document.source.encode())
if stderr:
log.error("Error while running flake8 '%s'", stderr.decode())
return stdout.decode()
diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
index 5491787..6449cda 100644
--- a/pylsp/plugins/pylint_lint.py
+++ b/pylsp/plugins/pylint_lint.py
@@ -7,6 +7,7 @@
import logging
import sys
import re
+from contextlib import ExitStack
from subprocess import Popen, PIPE
from pylint.epylint import py_run
@@ -232,18 +233,21 @@ def _run_pylint_stdio(pylint_executable, document, flags):
:rtype: string
"""
log.debug("Calling %s with args: '%s'", pylint_executable, flags)
- try:
- cmd = [pylint_executable]
- cmd.extend(flags)
- cmd.extend(['--from-stdin', document.path])
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- except IOError:
- log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
- cmd = ['python', '-m', 'pylint']
- cmd.extend(flags)
- cmd.extend(['--from-stdin', document.path])
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- (stdout, stderr) = p.communicate(document.source.encode())
+ with ExitStack() as stack:
+ try:
+ cmd = [pylint_executable]
+ cmd.extend(flags)
+ cmd.extend(['--from-stdin', document.path])
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ stack.enter_context(p)
+ except IOError:
+ log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
+ cmd = ['python', '-m', 'pylint']
+ cmd.extend(flags)
+ cmd.extend(['--from-stdin', document.path])
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ stack.enter_context(p)
+ (stdout, stderr) = p.communicate(document.source.encode())
if stderr:
log.error("Error while running pylint '%s'", stderr.decode())
return stdout.decode()
diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
index eaabd40..4faf0dd 100644
--- a/test/plugins/test_flake8_lint.py
+++ b/test/plugins/test_flake8_lint.py
@@ -21,10 +21,9 @@ def using_const():
def temp_document(doc_text, workspace):
- temp_file = tempfile.NamedTemporaryFile(mode='w', delete=False)
- name = temp_file.name
- temp_file.write(doc_text)
- temp_file.close()
+ with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+ name = temp_file.name
+ temp_file.write(doc_text)
doc = Document(uris.from_fs_path(name), workspace)
return name, doc
diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py
index f83e754..cf7a7e4 100644
--- a/test/plugins/test_pylint_lint.py
+++ b/test/plugins/test_pylint_lint.py
@@ -28,10 +28,9 @@ def hello():
@contextlib.contextmanager
def temp_document(doc_text, workspace):
try:
- temp_file = tempfile.NamedTemporaryFile(mode='w', delete=False)
- name = temp_file.name
- temp_file.write(doc_text)
- temp_file.close()
+ with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+ name = temp_file.name
+ temp_file.write(doc_text)
yield Document(uris.from_fs_path(name), workspace)
finally:
os.remove(name)
From 2d980b6d99b06de827d6589a48a75c6b196b32f4 Mon Sep 17 00:00:00 2001
From: krassowski <krassowski.michal@gmail.com>
Date: Sun, 25 Apr 2021 22:14:53 +0100
Subject: [PATCH 2/2] Revert the use of ExitStack, as requested
---
pylsp/plugins/flake8_lint.py | 25 ++++++++++---------------
pylsp/plugins/pylint_lint.py | 28 ++++++++++++----------------
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
index dfee5b4..03504ef 100644
--- a/pylsp/plugins/flake8_lint.py
+++ b/pylsp/plugins/flake8_lint.py
@@ -5,7 +5,6 @@
import logging
import os.path
import re
-from contextlib import ExitStack
from subprocess import Popen, PIPE
from pylsp import hookimpl, lsp
@@ -66,20 +65,16 @@ def run_flake8(flake8_executable, args, document):
)
log.debug("Calling %s with args: '%s'", flake8_executable, args)
- with ExitStack() as stack:
- try:
- cmd = [flake8_executable]
- cmd.extend(args)
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
- stack.enter_context(p)
- except IOError:
- log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
- cmd = ['python', '-m', 'flake8']
- cmd.extend(args)
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
- stack.enter_context(p)
- # exit stack ensures that even if an exception happens, the process `p` will be properly terminated
- (stdout, stderr) = p.communicate(document.source.encode())
+ try:
+ cmd = [flake8_executable]
+ cmd.extend(args)
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ except IOError:
+ log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
+ cmd = ['python', '-m', 'flake8']
+ cmd.extend(args)
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ (stdout, stderr) = p.communicate(document.source.encode())
if stderr:
log.error("Error while running flake8 '%s'", stderr.decode())
return stdout.decode()
diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
index 6449cda..d5ff3db 100644
--- a/pylsp/plugins/pylint_lint.py
+++ b/pylsp/plugins/pylint_lint.py
@@ -7,7 +7,6 @@
import logging
import sys
import re
-from contextlib import ExitStack
from subprocess import Popen, PIPE
from pylint.epylint import py_run
@@ -233,21 +232,18 @@ def _run_pylint_stdio(pylint_executable, document, flags):
:rtype: string
"""
log.debug("Calling %s with args: '%s'", pylint_executable, flags)
- with ExitStack() as stack:
- try:
- cmd = [pylint_executable]
- cmd.extend(flags)
- cmd.extend(['--from-stdin', document.path])
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
- stack.enter_context(p)
- except IOError:
- log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
- cmd = ['python', '-m', 'pylint']
- cmd.extend(flags)
- cmd.extend(['--from-stdin', document.path])
- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
- stack.enter_context(p)
- (stdout, stderr) = p.communicate(document.source.encode())
+ try:
+ cmd = [pylint_executable]
+ cmd.extend(flags)
+ cmd.extend(['--from-stdin', document.path])
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ except IOError:
+ log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
+ cmd = ['python', '-m', 'pylint']
+ cmd.extend(flags)
+ cmd.extend(['--from-stdin', document.path])
+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) # pylint: disable=consider-using-with
+ (stdout, stderr) = p.communicate(document.source.encode())
if stderr:
log.error("Error while running pylint '%s'", stderr.decode())
return stdout.decode()
|
GitWeb