Removed InitThreads property and deprecated PyEval_InitThreads which does nothing since python 3.7.

pyscripter · pyscripter · commit 603a9f638f87 · 2024-04-01T19:02:48.000+03:00
diff --git a/Demos/Demo11/ThSort.dfm b/Demos/Demo11/ThSort.dfm
@@ -165,7 +165,6 @@ object ThreadSortForm: TThreadSortForm
     OnClick = SaveBtnClick
   end
   object PythonEngine1: TPythonEngine
-    InitThreads = True
     RedirectIO = False
     Left = 16
     Top = 32
diff --git a/Demos/Demo33/ThSort.dfm b/Demos/Demo33/ThSort.dfm
@@ -171,7 +171,6 @@ object ThreadSortForm: TThreadSortForm
     OnClick = StopBtnClick
   end
   object PythonEngine1: TPythonEngine
-    InitThreads = True
     PyFlags = [pfDebug, pfInteractive, pfVerbose]
     RedirectIO = False
     Left = 16
diff --git a/Source/PythonEngine.pas b/Source/PythonEngine.pas
@@ -1605,7 +1605,6 @@   TPythonInterface=class(TDynamicDll)
     PyEval_GetGlobals:function :PPyObject; cdecl;
     PyEval_GetLocals:function :PPyObject; cdecl;
 
-    PyEval_InitThreads:procedure; cdecl;
     PyEval_RestoreThread:procedure( tstate: PPyThreadState); cdecl;
     PyEval_SaveThread:function :PPyThreadState; cdecl;
 
@@ -2013,7 +2012,6 @@   TPythonEngine = class(TPythonInterface)
     FProgramName:                UnicodeString;
     FPythonHome:                 UnicodeString;
     FPythonPath:                 WCharTString;
-    FInitThreads:                Boolean;
     FOnSysPathInit:              TSysPathInitEvent;
     FTraceback:                  TPythonTraceback;
     FUseWindowsConsole:          Boolean;
@@ -2042,7 +2040,6 @@   TPythonEngine = class(TPythonInterface)
     procedure DoOpenDll(const aDllName : string); override;
     procedure SetInitScript(Value: TStrings);
     function  GetThreadState: PPyThreadState;
-    procedure SetInitThreads(Value: Boolean);
     function  GetClientCount : Integer;
     function  GetClients( idx : Integer ) : TEngineClient;
     procedure Notification(AComponent: TComponent;
@@ -2159,7 +2156,6 @@   TPythonEngine = class(TPythonInterface)
     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;
     property IO: TPythonInputOutput read FIO write SetIO;
     property PyFlags: TPythonFlags read FPyFlags write SetPyFlags default [];
     property RedirectIO: Boolean read FRedirectIO write FRedirectIO default True;
@@ -3880,7 +3876,6 @@ procedure TPythonInterface.MapDll;
   PyEval_GetFrame           := Import('PyEval_GetFrame');
   PyEval_GetGlobals         := Import('PyEval_GetGlobals');
   PyEval_GetLocals          := Import('PyEval_GetLocals');
-  PyEval_InitThreads        := Import('PyEval_InitThreads');
   PyEval_RestoreThread      := Import('PyEval_RestoreThread');
   PyEval_SaveThread         := Import('PyEval_SaveThread');
   PyFile_GetLine            := Import('PyFile_GetLine');
@@ -4555,7 +4550,6 @@ constructor TPythonEngine.Create(AOwner: TComponent);
   FRedirectIO              := True;
   FExecModule              := '__main__';
   FAutoFinalize            := True;
-  FInitThreads             := False;
   FTraceback               := TPythonTraceback.Create;
   FUseWindowsConsole       := False;
   FPyFlags                 := [];
@@ -4787,8 +4781,6 @@ procedure TPythonEngine.Initialize;
     else
       FInitialized := True;
     InitSysPath;
-    if InitThreads and Assigned(PyEval_InitThreads) then
-      PyEval_InitThreads;
     if RedirectIO and Assigned(FIO) then
       DoRedirectIO;
   end;
@@ -4820,16 +4812,6 @@ function TPythonEngine.GetThreadState: PPyThreadState;
     Result := nil;
 end;
 
-procedure TPythonEngine.SetInitThreads(Value: Boolean);
-begin
-  if Value <> FInitThreads then
-  begin
-    if Value and Assigned(PyEval_InitThreads) then
-      PyEval_InitThreads;
-    FInitThreads := Value;
-  end;
-end;
-
 procedure TPythonEngine.SetIO(InputOutput: TPythonInputOutput);
 begin
   if InputOutput <> fIO then
diff --git a/Tests/AutoWrapEventHandlerTest.pas b/Tests/AutoWrapEventHandlerTest.pas
@@ -71,7 +71,6 @@ procedure TTestAutoWrapEventHandlers.SetupFixture;
   PythonEngine.FatalMsgDlg := True;
   PythonEngine.UseLastKnownVersion := True;
   PythonEngine.AutoFinalize := True;
-  PythonEngine.InitThreads := True;
   PythonEngine.PyFlags := [pfInteractive];
   DelphiModule := TPythonModule.Create(nil);
   DelphiModule.Name := 'DelphiModule';
diff --git a/Tests/NumberServicesTest.pas b/Tests/NumberServicesTest.pas
@@ -176,7 +176,6 @@ procedure TTestNumberServices.SetupFixture;
   PythonEngine.UseLastKnownVersion := True;
 
   PythonEngine.AutoFinalize := True;
-  PythonEngine.InitThreads := True;
   PythonEngine.PyFlags := [pfInteractive];
   PythonEngine.LoadDll;
 
diff --git a/Tests/VarPythTest.pas b/Tests/VarPythTest.pas
@@ -74,7 +74,6 @@ procedure TTestVarPyth.SetupFixture;
   PythonEngine.UseLastKnownVersion := True;
 
   PythonEngine.AutoFinalize := True;
-  PythonEngine.InitThreads := True;
   PythonEngine.PyFlags := [pfInteractive];
   PythonEngine.LoadDll;
 end;
diff --git a/Tests/WrapDelphiEventHandlerTest.pas b/Tests/WrapDelphiEventHandlerTest.pas
@@ -215,7 +215,6 @@ procedure TTestWrapDelphiEventHandlers.SetupFixture;
   PythonEngine.FatalMsgDlg := True;
   PythonEngine.UseLastKnownVersion := True;
   PythonEngine.AutoFinalize := True;
-  PythonEngine.InitThreads := True;
   PythonEngine.PyFlags := [pfInteractive];
   DelphiModule := TPythonModule.Create(nil);
   DelphiModule.Name := 'DelphiModule';
diff --git a/Tests/WrapDelphiTest.pas b/Tests/WrapDelphiTest.pas
@@ -202,7 +202,6 @@ procedure TTestWrapDelphi.SetupFixture;
   PythonEngine.UseLastKnownVersion := True;
 
   PythonEngine.AutoFinalize := True;
-  PythonEngine.InitThreads := True;
   PythonEngine.PyFlags := [pfInteractive];
 
   DelphiModule := TPythonModule.Create(nil);
diff --git a/Tutorials/Webinar II/AnalyticsDemo/MainFormSVG.dfm b/Tutorials/Webinar II/AnalyticsDemo/MainFormSVG.dfm
@@ -254,7 +254,6 @@ object Form1: TForm1
     Top = 89
   end
   object PythonEngine1: TPythonEngine
-    InitThreads = True
     IO = PythonGUIInputOutput1
     Left = 632
     Top = 136
