Multi-phase module initialization implemented.

DemoModule/uMain.pas and RttiModule/uMain.pas have been updated to showcase multi-phase initialization

Author: pyscripter

Modules/DemoModule/uMain.pas

@@ -7,13 +7,14 @@ interface
 function PyInit_DemoModule: PPyObject; cdecl;
 
 implementation
-Uses
+uses
+  Winapi.Windows,
   System.Math,
   WrapDelphi;
 
 var
-  gEngine : TPythonEngine;
-  gModule : TPythonModule;
+  gEngine : TPythonEngine = nil;
+  gModule : TPythonModule = nil;
 
 function IsPrime(x: Integer): Boolean;
 // Naive implementation.  It is just a demo
@@ -46,6 +47,7 @@ function delphi_is_prime(self, args : PPyObject) : PPyObject; cdecl;
 
 function PyInit_DemoModule: PPyObject;
 begin
+  if not Assigned(gEngine) then
   try
     gEngine := TPythonEngine.Create(nil);
     gEngine.AutoFinalize := False;
@@ -56,12 +58,18 @@ function PyInit_DemoModule: PPyObject;
     gModule.ModuleName := 'DemoModule';
     gModule.AddMethod('is_prime', delphi_is_prime, 'is_prime(n) -> bool' );
 
+    // We need to set this so that the module is not created by Initialzize
+    gModule.IsExtensionModule := True;
+    gModule.MultInterpretersSupport := mmiPerInterpreterGIL;
+
     gEngine.LoadDllInExtensionModule;
   except
+    Exit(nil);
   end;
-  Result := gModule.Module;
-end;
 
+  // The python import machinery will create the python module from ModuleDef
+  Result := gEngine.PyModuleDef_Init(@gModule.ModuleDef);
+end;
 
 initialization
 finalization

Modules/RttiModule/uMain.pas

@@ -17,6 +17,7 @@ implementation
   TDelphiFunctions = class
   public
     class function is_prime(const N: Integer): Boolean; static;
+    class procedure AfterModuleInit(Sender: TObject);
   end;
 
 var
@@ -25,39 +26,53 @@   TDelphiFunctions = class
   gDelphiWrapper : TPyDelphiWrapper;
   DelphiFunctions: TDelphiFunctions;
 
-
-
 function PyInit_DemoModule: PPyObject;
-var
-  Py : PPyObject;
 begin
+  if not Assigned(gEngine) then
   try
     gEngine := TPythonEngine.Create(nil);
     gEngine.AutoFinalize := False;
     gEngine.UseLastKnownVersion := True;
 
+    gDelphiWrapper := TPyDelphiWrapper.Create(nil);
+    gDelphiWrapper.Engine := gEngine;
+
+    // !!It is important that the extension module is the last
+    // Engine client created
     gModule := TPythonModule.Create(nil);
     gModule.Engine := gEngine;
     gModule.ModuleName := 'DemoModule';
 
-    gDelphiWrapper := TPyDelphiWrapper.Create(nil);
-    gDelphiWrapper.Engine := gEngine;
+    // Set IsExtensionModule so that the module is not created by Initialzize
+    gModule.IsExtensionModule := True;
+    gModule.MultInterpretersSupport := mmiPerInterpreterGIL;
+    gModule.OnAfterInitialization := TDelphiFunctions.AfterModuleInit;
+
     gDelphiWrapper.Module := gModule;
 
     gEngine.LoadDllInExtensionModule;
-    Py := gDelphiWrapper.Wrap(DelphiFunctions, TObjectOwnership.soReference);
-    gModule.SetVar('delphi_funcs', Py);
-    gEngine.Py_DecRef(Py);
   except
+    Exit(nil);
   end;
-  Result := gModule.Module;
+
+  // The python import machinery will create the python module from ModuleDef
+  Result := gEngine.PyModuleDef_Init(@gModule.ModuleDef);
 end;
 
 { TTestRttiAccess }
 
 
 { TDelphiFunctions }
 
+class procedure TDelphiFunctions.AfterModuleInit(Sender: TObject);
+var
+  Py : PPyObject;
+begin
+  Py := gDelphiWrapper.Wrap(DelphiFunctions, TObjectOwnership.soReference);
+  gModule.SetVar('delphi_funcs', Py);
+  gEngine.Py_DecRef(Py);
+end;
+
 class function TDelphiFunctions.is_prime(const N: Integer): Boolean;
 // Naive implementation.  It is just a demo...
 begin