Renamed VENVPythonExe to PythonExecutable

pyscripter · pyscripter · commit 29aafb1ffde4 · 2024-12-10T02:08:08.000+02:00
diff --git a/Source/PythonEngine.pas b/Source/PythonEngine.pas
@@ -2003,7 +2003,7 @@   TPythonType = class; //forward declaration
   {$IFEND}
   TPythonEngine = class(TPythonInterface)
   private
-    FVenvPythonExe:              string;
+    FPythonExecutable:           string;
     FInitScript:                 TStrings;
     FIO:                         TPythonInputOutput;
     FRedirectIO:                 Boolean;
@@ -2153,7 +2153,7 @@   TPythonEngine = class(TPythonInterface)
     property PythonPath: UnicodeString read FPythonPath write FPythonPath;
   published
     property AutoFinalize: Boolean read FAutoFinalize write FAutoFinalize default True;
-    property VenvPythonExe: string read FVenvPythonExe write FVenvPythonExe;
+    property PythonExecutable: string read FPythonExecutable write FPythonExecutable;
     property DatetimeConversionMode: TDatetimeConversionMode read FDatetimeConversionMode write FDatetimeConversionMode default DEFAULT_DATETIME_CONVERSION_MODE;
     property InitScript: TStrings read FInitScript write SetInitScript;
     property IO: TPythonInputOutput read FIO write SetIO;
@@ -4760,10 +4760,10 @@ procedure TPythonEngine.Initialize;
           PPWcharT(PByte(@Config) + ConfigOffests[MinorVersion, TConfigFields.home]),
           PWCharT(StringToWCharTString(FPythonHome)));
       // Set venv executable if available
-      if FVenvPythonExe <> '' then
+      if FPythonExecutable <> '' then
         PyConfig_SetString(Config,
           PPWcharT(PByte(@Config) + ConfigOffests[MinorVersion, TConfigFields.executable]),
-          PWCharT(StringToWCharTString(FVenvPythonExe)));
+          PWCharT(StringToWCharTString(FPythonExecutable)));
 
       // Set program arguments (sys.argv)
       SetProgramArgs(Config);
@@ -4872,8 +4872,8 @@ procedure TPythonEngine.Initialize;
       if FPythonHome <> '' then
         PyInitConfig_SetStr(Config, 'home', PAnsiChar(EncodeString(FPythonHome)));
       // Set venv executable if available
-      if FVenvPythonExe <> '' then
-        PyInitConfig_SetStr(Config, 'executable', PAnsiChar(EncodeString(FPythonHome)));
+      if FPythonExecutable <> '' then
+        PyInitConfig_SetStr(Config, 'executable', PAnsiChar(EncodeString(FPythonExecutable)));
 
       // Set program arguments (sys.argv)
       SetProgramArgs(Config);
diff --git a/Source/PythonVersions.pas b/Source/PythonVersions.pas
@@ -127,7 +127,7 @@ procedure TPythonVersion.AssignTo(PythonEngine: TPersistent);
     TPythonEngine(PythonEngine).DllPath := DLLPath;
     TPythonEngine(PythonEngine).APIVersion := ApiVersion;
     if Is_venv then begin
-      TPythonEngine(PythonEngine).VenvPythonExe := PythonExecutable;
+      TPythonEngine(PythonEngine).PythonExecutable := PythonExecutable;
       TPythonEngine(PythonEngine).SetPythonHome(DLLPath);
     end else
       {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ procedure TPythonVersion.AssignTo(PythonEngine: TPersistent);`
`127`	`127`	`TPythonEngine(PythonEngine).DllPath := DLLPath;`
`128`	`128`	`TPythonEngine(PythonEngine).APIVersion := ApiVersion;`
`129`	`129`	`if Is_venv then begin`
`130`		`- TPythonEngine(PythonEngine).VenvPythonExe := PythonExecutable;`
	`130`	`+ TPythonEngine(PythonEngine).PythonExecutable := PythonExecutable;`
`131`	`131`	`TPythonEngine(PythonEngine).SetPythonHome(DLLPath);`
`132`	`132`	`end else`
`133`	`133`	`{`