removed python2Path setting #220

DonJayamanne · DonJayamanne · commit f1a335b33bd9 · 2016-07-21T10:57:01.000+10:00
diff --git a/package.json b/package.json
@@ -275,11 +275,6 @@
           "default": "python",
           "description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path."
         },
-        "python.python2Path": {
-          "type": "string",
-          "default": "python",
-          "description": "Path to Python 2.x used for Refactoring. Refactoring only works when using Python 2.x"
-        },
         "python.linting.enabled": {
           "type": "boolean",
           "default": true,
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -6,7 +6,6 @@ import {EventEmitter} from 'events';
 
 export interface IPythonSettings {
     pythonPath: string;
-    python2Path: string;
     devOptions: any[];
     linting: ILintingSettings;
     formatting: IFormattingSettings;
@@ -82,11 +81,10 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
     }
     public static getInstance(): PythonSettings {
         return PythonSettings.pythonSettings;
-    }    
+    }
     private initializeSettings() {
         let pythonSettings = vscode.workspace.getConfiguration('python');
         this.pythonPath = systemVariables.resolveAny(pythonSettings.get<string>('pythonPath'));
-        this.python2Path = systemVariables.resolveAny(pythonSettings.get<string>('python2Path'));
         this.devOptions = systemVariables.resolveAny(pythonSettings.get<any[]>('devOptions'));
         this.devOptions = Array.isArray(this.devOptions) ? this.devOptions : [];
         let lintingSettings = systemVariables.resolveAny(pythonSettings.get<ILintingSettings>('linting'));
@@ -124,7 +122,6 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
     }
 
     public pythonPath: string;
-    public python2Path: string;
     public devOptions: any[];
     public linting: ILintingSettings;
     public formatting: IFormattingSettings;
diff --git a/src/client/refactor/proxy.ts b/src/client/refactor/proxy.ts
@@ -8,7 +8,7 @@ import {ExtractResult} from './contracts';
 import {execPythonFile} from '../common/utils';
 import {IPythonSettings} from '../common/configSettings';
 
-const ROPE_PYTHON_VERSION = 'Refactor requires Python 2.x. Set \'python.pythonRopePath\' in Settings.json';
+const ROPE_PYTHON_VERSION = 'Currently code refactoring is only supported in Python 2.x';
 const ERROR_PREFIX = '$ERROR';
 
 export class RefactorProxy extends vscode.Disposable {
@@ -62,31 +62,35 @@ export class RefactorProxy extends vscode.Disposable {
             return Promise.resolve(RefactorProxy.pythonPath);
         }
 
-        if (this.pythonSettings.pythonPath === this.pythonSettings.python2Path) {
-            // First try what ever path we have in pythonRopePath
-            return this.checkIfPythonVersionIs3(this.pythonSettings.python2Path).then(() => {
-                return this.pythonSettings.python2Path;
+        // First try what ever path we have in pythonRopePath
+        let promiseReult = this.checkIfPythonVersionIs2(this.pythonSettings.pythonPath).then(() => {
+            return this.pythonSettings.pythonPath;
+        });
+
+        if (this.pythonSettings.pythonPath !== 'python') {
+            promiseReult = promiseReult.catch(() => {
+                // Now try to use the default 'python' executable (if any)
+                return this.checkIfPythonVersionIs2('python').then(() => {
+                    return 'python';
+                });
             });
         }
 
-        // First try what ever path we have in pythonRopePath
-        return this.checkIfPythonVersionIs3(this.pythonSettings.python2Path).then(() => {
-            return this.pythonSettings.python2Path;
-        }).catch(() => {
-            // Now the path in pythonPath
-            return this.checkIfPythonVersionIs3(this.pythonSettings.pythonPath).then(() => {
-                return this.pythonSettings.pythonPath;
+        return promiseReult.catch(() => {
+            // Now try to find 'python2.7' (this seems to work on a Mac)
+            return this.checkIfPythonVersionIs2('python2.7').then(() => {
+                return 'python2.7';
             });
         });
     }
 
-    private checkIfPythonVersionIs3(pythonPath: string): Promise<boolean> {
+    private checkIfPythonVersionIs2(pythonPath: string): Promise<boolean> {
         return new Promise<boolean>((resolve, reject) => {
             child_process.execFile(pythonPath, ['-c', 'import sys;print(sys.version)'], null, (error, stdout, stderr) => {
-                if (stdout.indexOf('3.') === 0) {
-                    reject(new Error(ROPE_PYTHON_VERSION));
+                if (stdout.indexOf('2.') === 0) {
+                    return resolve(true);
                 }
-                resolve(true);
+                reject(new Error(ROPE_PYTHON_VERSION));
             });
         });
     }
