Better fix for python/cpython#100171

Author: pyscripter

Source/PythonEngine.pas

@@ -3033,7 +3033,9 @@ function  TDynamicDll.GetDllPath : string;
 
   if (DLLPath = '') and not FInExtensionModule then begin
     {$IFDEF MSWINDOWS}
-    IsPythonVersionRegistered(RegVersion, Result, AllUserInstall);
+    if IsPythonVersionRegistered(RegVersion, Result, AllUserInstall) and (Self is TPythonEngine) then
+      // https://github.com/python/cpython/issues/100171
+      TPythonEngine(Self).SetPythonHome(Result);
     {$ENDIF}
     {$IFDEF DARWIN}
     Result := '/Library/Frameworks/Python.framework/Versions/' + RegVersion + '/lib/';
@@ -4466,7 +4468,6 @@ procedure TPythonEngine.Initialize;
 
 var
   i : Integer;
-  WorkAround: AnsiString;
 begin
   if Assigned(gPythonEngine) then
     raise Exception.Create('There is already one instance of TPythonEngine running' );
@@ -4505,24 +4506,6 @@ procedure TPythonEngine.Initialize;
       if not Initialized then
         Initialize;
 
-  // WorkAround for https://github.com/python/cpython/issues/100171
-  if (MajorVersion = 3) and (MinorVersion >= 11) then
-  begin
-    WorkAround :=
-      'import sys'#13#10 + //0
-      'if sys.version_info > (3,11,0):'#13#10 + //1
-      '    import os'#13#10 + //2
-      ''#13#10 + //3
-      '    dllpath = os.path.join(sys.base_prefix, ''DLLs'')'#13#10 + //4
-      '    if dllpath not in sys.path:'#13#10 + //5
-      '        sys.path.insert(3, dllpath)'#13#10 + //6
-      ''#13#10 + //7
-      '    del dllpath'#13#10 + //8
-      '    del os'#13#10 + //9
-      'del sys'#13#10; //10
-    ExecString(WorkAround);
-  end;
-
   if InitScript.Count > 0 then
     ExecStrings(InitScript);
   if Assigned(FOnAfterInit) then

Source/PythonVersions.pas

@@ -123,13 +123,14 @@ procedure TPythonVersion.AssignTo(PythonEngine: TPersistent);
     if Is_venv then begin
       TPythonEngine(PythonEngine).VenvPythonExe := PythonExecutable;
       TPythonEngine(PythonEngine).SetPythonHome(DLLPath);
-    end else if not IsRegistered or Is_conda then
+    end else
       {
-         Not sure why but PythonHome needs to be set even for
-         registered conda distributions
-         Note also that for conda distributions to work properly,
+         Note that for conda distributions to work properly,
          you need to add Format('%s;%0:s\Library\bin;', [Version.InstallPath]
          to your Windows path if it is not there already.
+
+         Following the advice in https://github.com/python/cpython/issues/100171
+         SetPythonHome is called even for registered versions
       }
       TPythonEngine(PythonEngine).SetPythonHome(InstallPath);
   end;