Detect free-threaded python presence.

pyscripter · pyscripter · commit abbaeee55759 · 2024-12-13T18:12:04.000+02:00
diff --git a/Source/PythonVersions.pas b/Source/PythonVersions.pas
@@ -33,7 +33,7 @@   TPythonVersion = record
     function GetDisplayName: string;
     function GetApiVersion: integer;
     function GetSysArchitecture: string;
-    function GetPythonExecutable: string;
+    function GetPythonExecutable(Index: Integer): string;
   public
     IsRegistered: Boolean;
     IsAllUsers: Boolean;
@@ -46,7 +46,8 @@   TPythonVersion = record
     function Is_virtualenv: Boolean;
     function Is_conda: Boolean;
     procedure AssignTo(PythonEngine: TPersistent);
-    property PythonExecutable: string read GetPythonExecutable;
+    property PythonExecutable: string index 0 read GetPythonExecutable;
+    property PythonFreeThreadedExecutable: string index 1 read GetPythonExecutable;
     property DLLName: string read GetDLLName;
     property SysArchitecture: string read GetSysArchitecture;
     property IsPython3K: Boolean read GetIsPython3K;
@@ -204,11 +205,18 @@ function TPythonVersion.GetIsPython3K: Boolean;
   end;
 end;
 
-function TPythonVersion.GetPythonExecutable: string;
+function TPythonVersion.GetPythonExecutable(Index: Integer): string;
+var
+  ExeName: string;
 begin
-  Result := IncludeTrailingPathDelimiter(InstallPath) + 'python.exe';
+  if Index = 0 then
+    ExeName := 'python.exe'
+  else
+    ExeName := Format('python%st.exe', [SysVersion]);
+
+  Result := IncludeTrailingPathDelimiter(InstallPath) + ExeName;
   if not FileExists(Result) then begin
-    Result := IncludeTrailingPathDelimiter(InstallPath) +  'Scripts' + PathDelim + 'python.exe';
+    Result := IncludeTrailingPathDelimiter(InstallPath) +  'Scripts' + PathDelim + ExeName;
     if not FileExists(Result) then Result := '';
   end;
 end;
