Handle assignment of Py_None to an event property.

pyscripter · pyscripter · commit 983087259d23 · 2023-10-20T04:00:44.000+03:00
diff --git a/Source/WrapDelphi.pas b/Source/WrapDelphi.pas
@@ -1610,16 +1610,24 @@ function TExposedEvent.SetterWrapper(AObj, AValue: PPyObject; AContext: Pointer)
           end;
         end;
 
-      EventHandler := TRttiEventHandler.Create(FPyDelphiWrapper,
-        RttiProp.PropInfo, AValue, RttiProp.PropertyType as TRttiMethodType);
+      if AValue = GetPythonEngine.Py_None then
+      begin
+        Method.Code := nil;
+        Method.Data := nil;
+      end
+      else
+      begin
+        EventHandler := TRttiEventHandler.Create(FPyDelphiWrapper,
+          RttiProp.PropInfo, AValue, RttiProp.PropertyType as TRttiMethodType);
 
-      Method.Code := EventHandler.CodeAddress;
-      Method.Data := EventHandler;
-      SetMethodProp(Obj, RttiProp.PropInfo, Method);
+        if not Assigned(PyObject.fEventHandlers) then
+          PyObject.fEventHandlers := TObjectList.Create(True);
+        PyObject.fEventHandlers.Add(EventHandler);
 
-      if not Assigned(PyObject.fEventHandlers) then
-        PyObject.fEventHandlers := TObjectList.Create(True);
-      PyObject.fEventHandlers.Add(EventHandler);
+        Method.Code := EventHandler.CodeAddress;
+        Method.Data := EventHandler;
+      end;
+      SetMethodProp(Obj, RttiProp.PropInfo, Method);
 
       Result := 0;
     except
