Skip to content

Commit 474ad1c

Browse files
committed
Fix #52. Remove stray output from dmypy
There shouldn't be any output to stdout as this will mess the message stream when pylsp is running in stdout mode.
1 parent 7237723 commit 474ad1c

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pylsp_mypy/plugin.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def get_diagnostics(
253253
# -> use mypy on path
254254
log.info("executing mypy args = %s on path", args)
255255
completed_process = subprocess.run(
256-
["mypy", *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE, **windows_flag
256+
["mypy", *args], capture_output=True, **windows_flag
257257
)
258258
report = completed_process.stdout.decode()
259259
errors = completed_process.stderr.decode()
@@ -275,7 +275,7 @@ def get_diagnostics(
275275
# -> use dmypy on path
276276
completed_process = subprocess.run(
277277
["dmypy", "--status-file", dmypy_status_file, "status"],
278-
stderr=subprocess.PIPE,
278+
capture_output=True,
279279
**windows_flag,
280280
)
281281
errors = completed_process.stderr.decode()
@@ -287,7 +287,9 @@ def get_diagnostics(
287287
errors.strip(),
288288
)
289289
subprocess.run(
290-
["dmypy", "--status-file", dmypy_status_file, "restart"], **windows_flag
290+
["dmypy", "--status-file", dmypy_status_file, "restart"],
291+
capture_output=True,
292+
**windows_flag
291293
)
292294
else:
293295
# dmypy does not exist on path, but must exist in the env pylsp-mypy is installed in
@@ -310,7 +312,7 @@ def get_diagnostics(
310312
# -> use mypy on path
311313
log.info("dmypy run args = %s via path", args)
312314
completed_process = subprocess.run(
313-
["dmypy", *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE, **windows_flag
315+
["dmypy", *args], capture_output=True, **windows_flag
314316
)
315317
report = completed_process.stdout.decode()
316318
errors = completed_process.stderr.decode()

test/test_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def test_option_overrides_dmypy(last_diagnostics_monkeypatch, workspace):
223223
"--show-column-numbers",
224224
document.path,
225225
]
226-
m.assert_called_with(expected, stderr=-1, stdout=-1, **windows_flag)
226+
m.assert_called_with(expected, capture_output=True, **windows_flag)
227227

228228

229229
def test_dmypy_status_file(tmpdir, last_diagnostics_monkeypatch, workspace):

0 commit comments

Comments
 (0)