Fix pyscripter#253

Free always frees DelphiObject Ownership affects what happens when the Python object is destroyed when its reference Count goes down to zero.

Author: pyscripter

Source/WrapDelphi.pas

@@ -521,8 +521,6 @@ TPyDelphiObject = class (TPyInterfacedObject, IFreeNotificationSubscriber)
  function GetContainerAccess: TContainerAccess;
  procedure SetDelphiObject(const Value: TObject);
  protected
- fCanFreeOwnedObject : Boolean;
-
  function CheckBound : Boolean;
  function HasContainerAccessClass : Boolean;
  procedure SubscribeToFreeNotification; virtual;
@@ -906,7 +904,6 @@ implementation
  rs_ErrSqAss = 'Container %s does not support indexed write (f[i] = x)';
  rs_ErrSqContains = 'Container %s does not support the Contains protocol';
  rs_ErrCheckBound = 'Delphi wrapper %s is not bound';
- rs_ErrFree = 'The Delphi object cannot be freed, since it is not Owned';
  rs_ErrSequence = 'Wrapper %s does not support sequences';
  rs_ErrInvalidArgs = '"%s" called with invalid arguments.'#$A'Error: %s';
  rs_ErrInvalidRet = 'Call "%s" returned a value that could not be coverted to Python'#$A'Error: %s';
@@ -1778,15 +1775,13 @@ function TPyDelphiObject.Free_Wrapper(args: PPyObject): PPyObject;
  begin
  if PyArg_ParseTuple( args, ':Free' ) <> 0 then
  begin
- if Owned or fCanFreeOwnedObject then begin
- DelphiObject := nil; // this will free the object automatically
- Owned := False;
- Result := ReturnNone;
- end else begin
- PyErr_SetObject (PyExc_AttributeError^,
- PyUnicodeFromString(rs_ErrFree));
- Result := nil;
+ if Assigned(fDelphiObject)then
+ begin
+ UnSubscribeToFreeNotification;
+ FreeAndNil(fDelphiObject);
  end;
+ Owned := False;
+ Result := ReturnNone;
  end
  else
  Result := nil;

Source/WrapDelphiClasses.pas

@@ -1024,7 +1024,6 @@ constructor TPyDelphiComponent.CreateWith(APythonType: TPythonType;
  begin
  DelphiObject := CreateComponent(TComponent(_owner));
  Owned := not Assigned(_owner);
- fCanFreeOwnedObject := True;
  end;
  end;
 end;

Tests/WrapDelphiTest.pas

@@ -47,6 +47,7 @@ TTestRttiAccess = class
  ObjectField: TObject;
  RecordField: TTestRecord;
  InterfaceField: ITestInterface;
+ function GetData: TObject;
  procedure BuyFruits(AFruits: TFruits);
  procedure SellFruits(const AFruits: TFruitDynArray);
  procedure SellFruitsInt(const AFruits:TIntegerDynArray);
@@ -116,6 +117,8 @@ TTestWrapDelphi = class(TObject)
  procedure TestGetStaticArray;
  [Test]
  procedure TestMethodWithVarAndOverload;
+ [Test]
+ procedure FreeReturnedObject;
  end;
 
 implementation
@@ -139,6 +142,16 @@ procedure TTestRttiAccess.BuyFruits(AFruits: TFruits);
 
 { TTestVarPyth }
 
+procedure TTestWrapDelphi.FreeReturnedObject;
+begin
+ PythonEngine.ExecString(
+ 'from delphi import rtti_var' + sLineBreak +
+ 'obj = rtti_var.GetData()' + sLineBreak +
+ 'obj.Free()'
+ );
+ Assert.Pass;
+end;
+
 procedure TTestWrapDelphi.SetupFixture;
 var
  Py : PPyObject;
@@ -417,6 +430,11 @@ function TTestRttiAccess.SetStringField(var Value: Integer): string;
  Result := StringField;
 end;
 
+function TTestRttiAccess.GetData: TObject;
+begin
+ Result := TStringList.Create;
+end;
+
 function TTestRttiAccess.GetDynArray: TInt64DynArray;
 var
  I: Integer;