Cleanup module notifications for TPythonType and TDelphiWrapper.

Author: pyscripter

Source/PythonEngine.pas

@@ -2342,7 +2342,8 @@   TPythonModule = class(TMethodsContainer)
       procedure DefineDocString;
       procedure Initialize; override;
       procedure InitializeForNewInterpreter;
-      procedure AddClient( client : TEngineClient );
+      procedure AddClient(Client : TEngineClient);
+      procedure RemoveClient(Client : TEngineClient);
       function  ErrorByName( const AName : AnsiString ) : TError;
       procedure RaiseError( const error, msg : AnsiString );
       procedure RaiseErrorFmt( const error, format : AnsiString; const Args : array of const );
@@ -5387,7 +5388,7 @@ procedure  TPythonEngine.RemoveClient( client : TEngineClient );
   // is not predictable and may cause some memory crashes !
   if (csDesigning in ComponentState) then
     FClients.Remove( client )
-  else if (Initialized) then begin
+  else if Initialized then begin
     FClients.Remove( client );
     if (ClientCount = 0) then
       Finalize;
@@ -7282,9 +7283,10 @@ procedure TPythonModule.InitializeForNewInterpreter;
   end;
 end;
 
-procedure TPythonModule.AddClient( client : TEngineClient );
+procedure TPythonModule.AddClient(Client : TEngineClient);
 begin
-  FClients.Add( client );
+  if FClients.IndexOf(Client) < 0 then
+    FClients.Add(Client);
 end;
 
 function TPythonModule.ErrorByName( const AName : AnsiString ) : TError;
@@ -7315,6 +7317,12 @@ procedure TPythonModule.RaiseErrorObj( const error, msg : AnsiString; obj : PPyO
   ErrorByName( error ).RaiseErrorObj( msg, obj );
 end;
 
+procedure TPythonModule.RemoveClient(Client: TEngineClient);
+begin
+  // Remove does not raise an exception if not found
+  FClients.Remove(Client);
+end;
+
 procedure TPythonModule.BuildErrors;
 var
   i : Integer;
@@ -7984,13 +7992,21 @@ procedure TPythonType.SetModule( val : TPythonModule );
 begin
   if val <> FModule then
     begin
+      if Assigned(FModule) then
+      begin
+        FModule.RemoveFreeNotification(Self);
+        FModule.RemoveClient(Self);
+      end;
       FModule := val;
       if Assigned(val) then
+      begin
+        val.FreeNotification(Self);
         if Initialized and not (csLoading in ComponentState) then
           if val.Initialized then
             AddTypeVar
           else
             val.AddClient(Self);
+      end;
     end;
 end;
 
@@ -8608,6 +8624,7 @@ destructor  TPythonType.Destroy;
 begin
   if gVarType = Self then
     gVarType := nil;
+  Module := nil;
   FDocString.Free;
   FServices.Free;
   inherited;

Source/WrapDelphi.pas

@@ -3679,6 +3679,7 @@ destructor TPyDelphiWrapper.Destroy;
   FreeAndNil(fClassRegister);
   FreeAndNil(fHelperClassRegister);
   FreeAndNil(fEventHandlerList);
+  Module := nil;
 
   //No need to free PythonType objects since they are owned;
   inherited;
@@ -3835,7 +3836,10 @@ procedure TPyDelphiWrapper.SetModule(const Value: TPythonModule);
 begin
   if Value <> FModule then begin
     if Assigned(FModule) then
+    begin
       FModule.RemoveFreeNotification(Self);
+      FModule.RemoveClient(Self);
+    end;
     FModule := Value;
     if Assigned(FModule) then
       FModule.FreeNotification(Self);