fixed shebang issues and remove virtualenv path support (support for virtual env needs to be done separately and properly)

DonJayamanne · DonJayamanne · commit 79387ed6a99a · 2016-03-04T11:46:35.000+11:00
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -51,24 +51,9 @@ export class PythonSettings implements IPythonSettings {
 
         this.initializeSettings();
     }
-    private getVirtualenvPath(): string {
-        var currentPath: string = vscode.workspace.rootPath;
-        if (process.platform == 'win32') {
-            var bin: string = "Scripts";
-            var _path: string = path.join(currentPath, bin, "python.exe");
-        }
-        else {
-            var bin: string = "bin";
-            var _path: string = path.join(currentPath, bin, "python");
-        }
-        return fs.existsSync(_path)
-            ? _path
-            : null;
-    }
     private initializeSettings() {
         var pythonSettings = vscode.workspace.getConfiguration("python");
-        var virtualEnvPath = this.getVirtualenvPath();
-        this.pythonPath = typeof virtualEnvPath === "string" ? virtualEnvPath : pythonSettings.get<string>("pythonPath");
+        this.pythonPath = pythonSettings.get<string>("pythonPath");
         var lintingSettings = pythonSettings.get<ILintingSettings>("linting");
         if (this.linting) {
             Object.assign<ILintingSettings, ILintingSettings>(this.linting, lintingSettings);
diff --git a/src/client/debugger/DebugClients/LocalDebugClient.ts b/src/client/debugger/DebugClients/LocalDebugClient.ts
@@ -87,34 +87,31 @@ export class LocalDebugClient extends DebugClient {
         }
     }
     private getShebangLines(program: string): Promise<string[]> {
+        const MAX_SHEBANG_LINES = 2;
         return new Promise<string[]>((resolve, reject) => {
             var lr = new LineByLineReader(program);
-            var lineNumber = 0;
             var shebangLines: string[] = [];
 
             lr.on('error', err=> {
-                resolve(shebangLines);
+                reject(err);
             });
             lr.on('line', (line: string) => {
-                lineNumber++;
+                if (shebangLines.length >= MAX_SHEBANG_LINES) {
+                    lr.close();
+                    return false;
+                }
                 var trimmedLine = line.trim();
                 if (trimmedLine.startsWith("#")) {
                     shebangLines.push(line);
                 }
-                if (lineNumber >= 2) {
-                    //Ensure we always have two lines, even if no shebangLines
-                    //This way if ever we get lines numbers in errors for the python file, we have a consistency
-                    while (shebangLines.length <= 2) {
-                        shebangLines.push("#");
-                    }
-                    resolve(shebangLines);
-                    lr.close();
+                else {
+                    shebangLines.push("#");
                 }
             });
             lr.on('end', function() {
                 //Ensure we always have two lines, even if no shebangLines
                 //This way if ever we get lines numbers in errors for the python file, we have a consistency
-                while (shebangLines.length <= 2) {
+                while (shebangLines.length < MAX_SHEBANG_LINES) {
                     shebangLines.push("#");
                 }
                 resolve(shebangLines);
