fix #688

Author: DonJayamanne

src/client/debugger/Common/Utils.ts

@@ -3,6 +3,10 @@
 import {IPythonProcess, IPythonThread, IPythonModule, IPythonEvaluationResult} from "./Contracts";
 import * as path from "path";
 import * as fs from 'fs';
+import * as child_process from 'child_process';
+
+export const IS_WINDOWS = /^win/.test(process.platform);
+export const PATH_VARIABLE_NAME = IS_WINDOWS ? 'Path' : 'PATH';
 
 const PathValidity: Map<string, boolean> = new Map<string, boolean>();
 export function validatePath(filePath: string): Promise<string> {
@@ -66,3 +70,45 @@ export function FixupEscapedUnicodeChars(value: string): string {
  return value;
 }
 
+export function getPythonExecutable(pythonPath: string): string {
+ // If only 'python'
+ if (pythonPath === 'python' ||
+ pythonPath.indexOf(path.sep) === -1 ||
+ path.basename(pythonPath) === path.dirname(pythonPath)) {
+ return pythonPath;
+ }
+
+ if (isValidPythonPath(pythonPath)) {
+ return pythonPath;
+ }
+
+ // Suffix with 'python' for linux and 'osx', and 'python.exe' for 'windows'
+ if (IS_WINDOWS) {
+ if (isValidPythonPath(path.join(pythonPath, 'python.exe'))) {
+ return path.join(pythonPath, 'python.exe');
+ }
+ if (isValidPythonPath(path.join(pythonPath, 'scripts', 'python.exe'))) {
+ return path.join(pythonPath, 'scripts', 'python.exe');
+ }
+ }
+ else {
+ if (isValidPythonPath(path.join(pythonPath, 'python'))) {
+ return path.join(pythonPath, 'python');
+ }
+ if (isValidPythonPath(path.join(pythonPath, 'bin', 'python'))) {
+ return path.join(pythonPath, 'bin', 'python');
+ }
+ }
+
+ return pythonPath;
+}
+
+function isValidPythonPath(pythonPath): boolean {
+ try {
+ let output = child_process.execFileSync(pythonPath, ['-c', 'print(1234)'], { encoding: 'utf8' });
+ return output.startsWith('1234');
+ }
+ catch (ex) {
+ return false;
+ }
+}

src/client/debugger/Main.ts

@@ -19,7 +19,7 @@ import { DebugClient, DebugType } from "./DebugClients/DebugClient";
 import { CreateAttachDebugClient, CreateLaunchDebugClient } from "./DebugClients/DebugFactory";
 import { DjangoApp, LaunchRequestArguments, AttachRequestArguments, DebugFlags, DebugOptions, TelemetryEvent, PythonEvaluationResultFlags } from "./Common/Contracts";
 import * as telemetryContracts from "../common/telemetryContracts";
-import { validatePath, validatePathSync } from './Common/Utils';
+import { validatePath, validatePathSync, getPythonExecutable } from './Common/Utils';
 import { isNotInstalledError } from '../common/helpers';
 
 const CHILD_ENUMEARATION_TIMEOUT = 5000;
@@ -200,6 +200,14 @@ export class PythonDebugger extends DebugSession {
  Debug_HasEnvVaraibles: args.env && typeof args.env === "object" ? "true" : "false"
  }));
 
+ // Add support for specifying just the directory where the python executable will be located
+ // E.g. virtual directory name
+ try {
+ args.pythonPath = getPythonExecutable(args.pythonPath);
+ }
+ catch (ex) {
+ }
+
  this.launchArgs = args;
  this.debugClient = CreateLaunchDebugClient(args, this);
  //this.debugClient.on('exit', () => this.sendEvent(new TerminatedEvent()));