Breaking change: Removed CreateWith overload with 3 arguments

TPyDelphiObject.CreateWith raises a python TypeError 'Cannot create instances of class %s' CreateWith overrides in general should call Create and create an instance and assign it to DelphiObject

Author: pyscripter

Demos/Demo08/Unit1.pas

@@ -38,7 +38,7 @@ TPyPoint = class(TPyObject)
 
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
 
  // Type services
  ////////////////
@@ -88,9 +88,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
 // the Create constructor first, and because the constructors
 // are virtual, TPyPoint.Create will be automatically be called.
 
-constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

Demos/Demo21/Unit1.pas

@@ -46,7 +46,7 @@ TPyPoint = class(TPyObject)
 
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
 
  // Type services
  ////////////////
@@ -81,9 +81,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
 // the Create constructor first, and because the constructors
 // are virtual, TPyPoint.Create will be automatically be called.
 
-constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

Demos/Demo26/Unit1.pas

@@ -35,7 +35,7 @@ TPyPoint = class(TPyObject)
 
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
 
  // Type services
  ////////////////
@@ -84,9 +84,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
 // the Create constructor first, and because the constructors
 // are virtual, TPyPoint.Create will be automatically be called.
 
-constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

Demos/Demo28/Unit1.pas

@@ -18,7 +18,7 @@ TPyStringList = class(TPyObject)
  public
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
  destructor Destroy; override;
 
  // Basic services
@@ -46,7 +46,7 @@ TPyStringListIterator = class(TPyObject)
  procedure SetStringList(const Value: TPyStringList);
  public
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
  destructor Destroy; override;
 
  // Basic services
@@ -145,11 +145,11 @@ constructor TPyStringList.Create(APythonType: TPythonType);
  fStrings := TStringList.Create;
 end;
 
-constructor TPyStringList.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyStringList.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 var
  i : Integer;
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  for i := 0 to PyTuple_Size(args)-1 do
@@ -241,12 +241,12 @@ constructor TPyStringListIterator.Create(APythonType: TPythonType);
  inherited;
 end;
 
-constructor TPyStringListIterator.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyStringListIterator.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 var
  _obj : PPyObject;
  _stringList : TPyStringList;
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'O:TPyStringListIterator constructor',@_obj ) <> 0 then

Demos/Demo32/Unit1.pas

@@ -111,7 +111,7 @@ constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
  KeyArray: array of AnsiString;
  KeyPointerArray: array of PAnsiChar;
 begin
- inherited;
+ Create(PythonType);
  KeyArray := ['x', 'y'];
  KeyPointerArray := [PAnsiChar(KeyArray[0]), PAnsiChar(KeyArray[1]), nil];
  with GetPythonEngine, DelphiObject as TPoint do

Demos/Demo34/Unit1.pas

@@ -43,7 +43,7 @@ TPyPoint = class(TPyObject)
 
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
 
  // Type services
  ////////////////
@@ -158,9 +158,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
 // the Create constructor first, and because the constructors
 // are virtual, TPyPoint.Create will automatically be called.
 
-constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
+constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
 begin
- inherited;
+ Create(PythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

Source/PythonEngine.pas

@@ -2393,8 +2393,7 @@ TPyObject = class
 
  // Constructors & Destructors
  constructor Create(APythonType: TPythonType); virtual;
- constructor CreateWith(APythonType: TPythonType; args: PPyObject); overload; virtual;
- constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); overload; virtual;
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); virtual;
  destructor Destroy; override;
 
  class function NewInstance: TObject; override;
@@ -2697,7 +2696,7 @@ TPyVar = class(TPyObject)
 
  // Constructors & Destructors
  constructor Create( APythonType : TPythonType ); override;
- constructor CreateWith(APythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
  destructor Destroy; override;
 
  // Type services
@@ -7462,15 +7461,10 @@ constructor TPyObject.Create(APythonType: TPythonType);
  end;
 end;
 
-constructor TPyObject.CreateWith(APythonType: TPythonType; args: PPyObject);
-begin
- Create(APythonType);
-end;
-
 constructor TPyObject.CreateWith(APythonType: TPythonType; args,
  kwds: PPyObject);
 begin
- CreateWith(APythonType, args);
+ Create(APythonType);
 end;
 
 destructor TPyObject.Destroy;
@@ -8960,9 +8954,9 @@ constructor TPyVar.Create( APythonType : TPythonType );
 // the Create constructor first, and because the constructors
 // are virtual, TPyVar.Create will be automatically be called.
 
-constructor TPyVar.CreateWith(APythonType: TPythonType; args: PPyObject);
+constructor TPyVar.CreateWith(APythonType: TPythonType; args, kwds: PPyObject);
 begin
- inherited;
+ Create(APythonType);
  with GetPythonEngine do
  begin
  if PyArg_ParseTuple( args, 'O:CreateVar',@dv_object ) = 0 then

Source/WrapDelphi.pas

@@ -569,6 +569,11 @@ TPyDelphiObject = class (TPyInterfacedObject, IFreeNotificationSubscriber)
  Owned: Boolean;
 
  constructor Create( APythonType : TPythonType ); override;
+ // CreateWith raises a python TypeError 'Cannot create instances..'
+ // Subclasses that can be instantiated need to overwrite this method and
+ // a) Call the virtual constructor Create
+ // b) Create the pascal object and assign it to DelphiObject
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
  destructor Destroy; override;
 
  function GetAttrO( key: PPyObject) : PPyObject; override;
@@ -985,6 +990,7 @@ implementation
  MethodCallback;
 
 resourcestring
+ rs_CannotCreate = 'Cannot create instances of class %s';
  rs_ErrCheckIndex = '%s "%d" out of range';
  rs_ErrCheckInt = '%s receives only integer values';
  rs_ErrCheckFloat = '%s receives only float values';
@@ -2540,6 +2546,13 @@ constructor TPyDelphiObject.Create(APythonType: TPythonType);
  PyDelphiWrapper := TPyDelphiWrapper(APythonType.Owner);
 end;
 
+constructor TPyDelphiObject.CreateWith(APythonType: TPythonType; args, kwds: PPyObject);
+begin
+ with APythonType.Engine do
+ PyErr_SetObject(PyExc_TypeError^, PyUnicodeFromString(
+ Format(rs_CannotCreate, [APythonType.TypeName])));
+end;
+
 function TPyDelphiObject.CreateContainerAccess: TContainerAccess;
 var
  _ContainerAccessClass : TContainerAccessClass;
@@ -3899,6 +3912,8 @@ class procedure TPyDelphiObject.ExposeIndexedProperties(AClass: TClass;
  LClass: TClass;
  LDocStr: string;
 begin
+ // TODO: Identify and handle the default property
+
  LRttiCtx := TRttiContext.Create();
  try
  LRttiType := LRttiCtx.GetType(AClass) as TRttiStructuredType;

Source/WrapDelphiClasses.pas

@@ -330,6 +330,7 @@ TPyDelphiMemoryStream = class(TPyDelphiCustomMemoryStream)
  function GetDelphiObject: TMemoryStream;
  procedure SetDelphiObject(const Value: TMemoryStream);
  public
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
  // Class methods
  class function DelphiObjectClass : TClass; override;
  // Properties
@@ -1257,7 +1258,7 @@ constructor TPyDelphiComponent.CreateWith(APythonType: TPythonType; args, kwds:
  _obj : PPyObject;
  _owner : TObject;
 begin
- inherited;
+ Create(APythonType);
  if APythonType.Engine.PyArg_ParseTuple( args, 'O:Create',@_obj ) <> 0 then
  begin
  _owner := nil;
@@ -1938,7 +1939,6 @@ class procedure TPyDelphiStream.SetupType(PythonType: TPythonType);
 
 class procedure TPyDelphiStream.RegisterMethods(PythonType: TPythonType);
 begin
- inherited;
  PythonType.AddMethod('ReadBytes', @TPyDelphiStream.ReadBytes_Wrapper,
  'TPyDelphiStream.ReadBytes()' + #10 + 'Read content as bytes.');
  PythonType.AddMethod('ReadInt', @TPyDelphiStream.ReadInt_Wrapper,
@@ -2132,7 +2132,7 @@ THandleStreamClass = class of THandleStream;
  LParamCount: NativeInt;
  LHandle: THandle;
 begin
- inherited;
+ Create(APythonType);
  //Clear unsuccessful overloaded constructor error
  APythonType.Engine.PyErr_Clear();
 
@@ -2295,6 +2295,15 @@ procedure TPyDelphiCustomMemoryStream.SetDelphiObject(
 
 { TPyDelphiMemoryStream }
 
+constructor TPyDelphiMemoryStream.CreateWith(APythonType: TPythonType; args, kwds: PPyObject);
+type
+ TMemoryStreamClass = class of TMemoryStream;
+begin
+ Create(APythonType);
+ if APythonType.Engine.PyArg_ParseTuple(args, ':Create') <> 0 then
+ DelphiObject := TMemoryStreamClass(DelphiObjectClass).Create;
+end;
+
 class function TPyDelphiMemoryStream.DelphiObjectClass: TClass;
 begin
  Result := TMemoryStream;

Source/WrapDelphiTypes.pas

@@ -40,7 +40,7 @@ TPyDelphiPoint = class(TPyObject)
  function Set_X(AValue : PPyObject; AContext : Pointer) : Integer; cdecl;
  function Set_Y(AValue : PPyObject; AContext : Pointer) : Integer; cdecl;
  public
- constructor CreateWith(APythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
 
  function Compare( obj: PPyObject) : Integer; override;
  function Repr : PPyObject; override;
@@ -72,7 +72,7 @@ TPyDelphiRect = class(TPyObject)
  public
  PyDelphiWrapper : TPyDelphiWrapper;
 
- constructor CreateWith(APythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
 
  function Compare( obj: PPyObject) : Integer; override;
  function Repr : PPyObject; override;
@@ -94,7 +94,7 @@ TPyDelphiSize = class(TPyObject)
  function Set_CX(AValue : PPyObject; AContext : Pointer) : Integer; cdecl;
  function Set_CY(AValue : PPyObject; AContext : Pointer) : Integer; cdecl;
  public
- constructor CreateWith(APythonType: TPythonType; args: PPyObject); override;
+ constructor CreateWith(APythonType: TPythonType; args, kwds: PPyObject); override;
 
  function Compare( obj: PPyObject) : Integer; override;
  function Repr : PPyObject; override;
@@ -290,12 +290,12 @@ function TPyDelphiPoint.Compare(obj: PPyObject): Integer;
  Result := 1;
 end;
 
-constructor TPyDelphiPoint.CreateWith(APythonType: TPythonType; args:
-   PPyObject);
+constructor TPyDelphiPoint.CreateWith(APythonType: TPythonType; args,
+ kwds: PPyObject);
 var
  x, y : Integer;
 begin
- inherited;
+ Create(APythonType);
  if APythonType.Engine.PyArg_ParseTuple( args, 'ii:Create',@x, @y ) <> 0 then
  begin
  fValue.X := x;
@@ -395,9 +395,10 @@ function TPyDelphiRect.Compare(obj: PPyObject): Integer;
  Result := 1;
 end;
 
-constructor TPyDelphiRect.CreateWith(APythonType: TPythonType; args: PPyObject);
+constructor TPyDelphiRect.CreateWith(APythonType: TPythonType; args,
+ kwds: PPyObject);
 begin
- inherited;
+ Create(APythonType);
  APythonType.Engine.PyArg_ParseTuple( args, 'iiii:Create',@fValue.Left, @fValue.Top, @fValue.Right, @fValue.Bottom );
 end;
 
@@ -581,11 +582,11 @@ function TPyDelphiSize.Compare(obj: PPyObject): Integer;
  Result := 1;
 end;
 
-constructor TPyDelphiSize.CreateWith(APythonType: TPythonType; args: PPyObject);
+constructor TPyDelphiSize.CreateWith(APythonType: TPythonType; args, kwds: PPyObject);
 var
  cx, cy : Integer;
 begin
- inherited;
+ Create(APythonType);
  if APythonType.Engine.PyArg_ParseTuple( args, 'ii:Create',@cx, @cy ) <> 0 then
  begin
  fValue.cx := cx;