Skip to content
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

Jump to bottom

Do not quote isolated in exec module #14108

Merged
merged 3 commits into from
Sep 25, 2020
Merged

Do not quote isolated in exec module #14108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9fa04c
Do not quote isolated in exec module
karthiknadig Sep 25, 2020
ecf0221
Revert "Do not quote isolated in exec module"
karthiknadig Sep 25, 2020
9e12210
Revert "IPyKernel install issue with windows paths (#13667)"
karthiknadig Sep 25, 2020
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
2 changes: 1 addition & 1 deletion src/client/common/process/internal/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function execCode(code: string, isolated = true): string[] {
export function execModule(name: string, moduleArgs: string[], isolated = true): string[] {
const args = ['-m', name, ...moduleArgs];
if (isolated) {
args[0] = ISOLATED.fileToCommandArgument();
args[0] = ISOLATED; // replace
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
args[0] = ISOLATED; // replace
args[0] = ISOLATED.replace(/\\/g, '/');

}
// "code" isn't specific enough to know how to parse it,
// so we only return the args.
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/process/internal/scripts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ export function shell_exec(command: string, lockfile: string, shellArgs: string[
// We don't bother with a "parse" function since the output
// could be anything.
return [
ISOLATED.fileToCommandArgument(),
ISOLATED,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ISOLATED,
ISOLATED.replace(/\\/g, '/'),

script,
command.fileToCommandArgument(),
// The shell args must come after the command
Expand Down
2 changes: 1 addition & 1 deletion src/test/common/moduleInstaller.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ import { closeActiveWindows, initializeTest } from './../initialize';

chai_use(chaiAsPromised);

const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py').replace(/\\/g, '/');
const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py');
const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py').replace(/\\/g, '/');


const info: PythonEnvironment = {
architecture: Architecture.Unknown,
Expand Down