@@ -26,8 +26,8 @@ PythonFinder.prototype = {
26
26
win : win ,
27
27
pyLauncher : 'py.exe' ,
28
28
winDefaultLocations : [
29
- path . join ( process . env . SystemDrive || 'C:' , 'Python27 ' , 'python.exe' ) ,
30
- path . join ( process . env . SystemDrive || 'C:' , 'Python37 ' , 'python.exe' )
29
+ path . join ( process . env . SystemDrive || 'C:' , 'Python37 ' , 'python.exe' ) ,
30
+ path . join ( process . env . SystemDrive || 'C:' , 'Python27 ' , 'python.exe' )
31
31
] ,
32
32
33
33
// Logs a message at verbose level, but also saves it to be displayed later
@@ -88,14 +88,14 @@ PythonFinder.prototype = {
88
88
arg : this . env . PYTHON
89
89
} ,
90
90
{
91
- before : ( ) => { this . addLog ( 'checking if "python " can be used' ) } ,
91
+ before : ( ) => { this . addLog ( 'checking if "python3 " can be used' ) } ,
92
92
check : this . checkCommand ,
93
- arg : 'python '
93
+ arg : 'python3 '
94
94
} ,
95
95
{
96
- before : ( ) => { this . addLog ( 'checking if "python3 " can be used' ) } ,
96
+ before : ( ) => { this . addLog ( 'checking if "python " can be used' ) } ,
97
97
check : this . checkCommand ,
98
- arg : 'python3 '
98
+ arg : 'python '
99
99
} ,
100
100
{
101
101
before : ( ) => { this . addLog ( 'checking if "python2" can be used' ) } ,
@@ -105,13 +105,6 @@ PythonFinder.prototype = {
105
105
]
106
106
107
107
if ( this . win ) {
108
- checks . push ( {
109
- before : ( ) => {
110
- this . addLog (
111
- 'checking if the py launcher can be used to find Python 2' )
112
- } ,
113
- check : this . checkPyLauncher
114
- } )
115
108
for ( var i = 0 ; i < this . winDefaultLocations . length ; ++ i ) {
116
109
const location = this . winDefaultLocations [ i ]
117
110
checks . push ( {
@@ -123,6 +116,13 @@ PythonFinder.prototype = {
123
116
arg : location
124
117
} )
125
118
}
119
+ checks . push ( {
120
+ before : ( ) => {
121
+ this . addLog (
122
+ 'checking if the py launcher can be used to find Python 2' )
123
+ } ,
124
+ check : this . checkPyLauncher
125
+ } )
126
126
}
127
127
128
128
return checks
0 commit comments