Fix pyscripter#82

Author: pyscripter

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -2201,6 +2201,7 @@   TPythonTraceback = class
   {$IFEND}
   TPythonEngine = class(TPythonInterface)
   private
+    FVenvPythonExe:              string;
     FInitScript:                 TStrings;
     FIO:                         TPythonInputOutput;
     FRedirectIO:                 Boolean;
@@ -2352,6 +2353,7 @@   TPythonEngine = class(TPythonInterface)
     property IOPythonModule: TObject read FIOPythonModule; {TPythonModule}
   published
     property AutoFinalize: Boolean read FAutoFinalize write FAutoFinalize default True;
+    property VenvPythonExe: string read FVenvPythonExe write FVenvPythonExe;
     property DatetimeConversionMode: TDatetimeConversionMode read FDatetimeConversionMode write FDatetimeConversionMode default DEFAULT_DATETIME_CONVERSION_MODE;
     property InitScript: TStrings read FInitScript write SetInitScript;
     property InitThreads: Boolean read FInitThreads write SetInitThreads default False;
@@ -4828,7 +4830,19 @@ procedure TPythonEngine.Initialize;
   procedure InitSysPath;
   var
     _path : PPyObject;
+  const Script =
+    'import sys' + sLineBreak +
+    'sys.executable = r"%s"' + sLineBreak +
+    'path = sys.path' + sLineBreak +
+    'for i in range(len(path)-1, -1, -1):' + sLineBreak +
+    '    if path[i].find("site-packages") > 0:' + sLineBreak +
+    '        path.pop(i)' + sLineBreak +
+    'import site' + sLineBreak +
+    'site.main()' + sLineBreak +
+    'del sys, path, i, site';
   begin
+     if VenvPythonExe <> '' then
+       ExecString(Format(Script, [VenvPythonExe]));
     _path := PySys_GetObject('path');
     if Assigned(FOnSysPathInit) then
       FOnSysPathInit(Self, _path);

PythonForDelphi/Components/Sources/Core/PythonVersions.pas

@@ -72,7 +72,8 @@   TPythonVersion = record
   function GetRegisteredPythonVersions : TPythonVersions;
   (* Returns the highest numbered registered Python version *)
   function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
-  function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion): Boolean;
+  function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion;
+     AcceptVirtualEnvs: Boolean = True): Boolean;
   {$ENDIF}
 
 implementation
@@ -122,6 +123,11 @@ procedure TPythonVersion.AssignTo(PythonEngine: TPersistent);
     TPythonEngine(PythonEngine).DllName := DLLName;
     TPythonEngine(PythonEngine).DllPath := DLLPath;
     TPythonEngine(PythonEngine).APIVersion := ApiVersion;
+    if Is_venv then begin
+      TPythonEngine(PythonEngine).VenvPythonExe := PythonExecutable;
+      TPythonEngine(PythonEngine).SetPythonHome(DLLPath);
+    end else if not IsRegistered then
+      TPythonEngine(PythonEngine).SetPythonHome(InstallPath);
   end;
 end;
 
@@ -416,7 +422,9 @@ function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Bo
   end;
 end;
 
-function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion): Boolean;
+function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion;
+  AcceptVirtualEnvs: Boolean = True): Boolean;
+
   function FindPythonDLL(APath : string): string;
   Var
     FindFileData: TWIN32FindData;
@@ -436,10 +444,29 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer
       Result := DLLFileName;
   end;
 
+  function GetVenvBasePrefix(InstallPath: string): string;
+  var
+    SL : TStringList;
+  begin
+    SL := TStringList.Create;
+    try
+       try
+         SL.LoadFromFile(IncludeTrailingPathDelimiter(InstallPath)+'pyvenv.cfg');
+         Result := Trim(SL.Values['home']);
+         if Result = '' then
+           Result := Trim(SL.Values['home ']);
+       except
+       end;
+    finally
+      SL.Free;
+    end;
+  end;
+
 Var
   DLLFileName: string;
   DLLPath: string;
   SysVersion: string;
+  BasePrefix: string;
   I: integer;
 begin
   Result := False;
@@ -450,11 +477,24 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer
   PythonVersion.InstallPath := DLLPath;
 
   DLLFileName := FindPythonDLL(DLLPath);
-  if DLLFileName = '' then begin
+
+  if (DLLFileName = '') and AcceptVirtualEnvs then begin
     DLLPath := DLLPath + '\Scripts';
     DLLFileName := FindPythonDLL(DLLPath);
   end;
-  if DLLFileName = '' then Exit;
+  if DLLFileName = '' then begin
+    if AcceptVirtualEnvs and PythonVersion.Is_venv then
+    begin
+      BasePrefix := GetVenvBasePrefix(PythonVersion.InstallPath);
+      if (BasePrefix <> '') and PythonVersionFromPath(BasePrefix, PythonVersion, False) then
+      begin
+        //  Install path points to venv but the rest of the info is from base_prefix
+        PythonVersion.InstallPath := ExcludeTrailingPathDelimiter(Path);
+        Result := True;
+      end;
+    end;
+    Exit;
+  end;
 
   // check if same platform
   try