Skip to content

Fix conda run output marker script #18412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karrtikr merged 1 commit into from
Feb 2, 2022
Merged

Fix conda run output marker script #18412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions pythonFiles/get_output_via_markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,21 @@
print(">>>PYTHON-EXEC-OUTPUT")

module = sys.argv[1]
if module == "-c":
ns = {}
for code in sys.argv[2:]:
exec(code, ns, ns)
elif module.startswith("-"):
raise NotImplementedError(sys.argv)
elif module.endswith(".py"):
runpy.run_path(module, run_name="__main__")
else:
runpy.run_module(module, run_name="__main__", alter_sys=True)

print("<<<PYTHON-EXEC-OUTPUT")
try:
if module == "-c":
ns = {}
for code in sys.argv[2:]:
exec(code, ns, ns)
elif module.startswith("-m"):
moduleName = sys.argv[2]
sys.argv = sys.argv[2:] # It should begin with the module name.
runpy.run_module(moduleName, run_name="__main__", alter_sys=True)
elif module.endswith(".py"):
sys.argv = sys.argv[1:]
runpy.run_path(module, run_name="__main__")
elif module.startswith("-"):
raise NotImplementedError(sys.argv)
else:
runpy.run_module(module, run_name="__main__", alter_sys=True)
finally:
print("<<<PYTHON-EXEC-OUTPUT")
4 changes: 2 additions & 2 deletions src/client/common/process/rawProcessApis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ function filterOutputUsingCondaRunMarkers(stdout: string) {
// run, see `get_output_via_markers.py`.
const regex = />>>PYTHON-EXEC-OUTPUT([\s\S]*)<<<PYTHON-EXEC-OUTPUT/;
const match = stdout.match(regex);
const filteredOut = match !== null && match.length >= 2 ? match[1].trim() : '';
return filteredOut.length ? filteredOut : stdout;
const filteredOut = match !== null && match.length >= 2 ? match[1].trim() : undefined;
return filteredOut !== undefined ? filteredOut : stdout;
}

function removeCondaRunMarkers(out: string) {
Expand Down