Fix pyscripter#382

Author: pyscripter

Demos/Demo31/Unit1.dfm

@@ -13,25 +13,22 @@ object Form1: TForm1
   Font.Name = 'MS Sans Serif'
   Font.Pitch = fpVariable
   Font.Style = []
-  OldCreateOrder = True
   Visible = True
   OnCreate = FormCreate
-  PixelsPerInch = 96
   TextHeight = 13
   object Splitter1: TSplitter
     Left = 0
     Top = 169
-    Width = 721
+    Width = 715
     Height = 3
     Cursor = crVSplit
     Align = alTop
-    ExplicitWidth = 677
   end
   object Memo1: TMemo
     Left = 0
     Top = 172
-    Width = 721
-    Height = 395
+    Width = 715
+    Height = 378
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -42,8 +39,8 @@ object Form1: TForm1
     Lines.Strings = (
 
         'from spam import DelphiVersion, MainForm, DVar, CreateComponent,' +
-        ' Application, Screen, mrOk, Form, Button, CheckBox, OpenDialog, ' +
-        'caFree'
+        ' Application, Screen, mrOk, Component, Form, Button, CheckBox, O' +
+        'penDialog, caFree'
 
         'from spam import Point, Monitor, DrawGrid, gdSelected, clBlue, s' +
         'sCtrl, PageControl, TabSheet'
@@ -493,6 +490,9 @@ object Form1: TForm1
         '          self.assertTrue(MainForm.Caption == '#39'From TTestRTTIAcc' +
         'ess.ObjectField'#39')'
       ''
+      '    def testInheritance(self):'
+      '         self.assertTrue(issubclass(Form, Component))'
+      '         self.assertTrue(issubclass(Button, Component))'
       ''
       'if __name__ == '#39'__main__'#39':'
       '    try:'
@@ -506,8 +506,8 @@ object Form1: TForm1
   end
   object Panel1: TPanel
     Left = 0
-    Top = 567
-    Width = 721
+    Top = 550
+    Width = 715
     Height = 41
     Align = alBottom
     BevelOuter = bvNone
@@ -525,7 +525,7 @@ object Form1: TForm1
   object Memo2: TMemo
     Left = 0
     Top = 0
-    Width = 721
+    Width = 715
     Height = 169
     Align = alTop
     Font.Charset = DEFAULT_CHARSET

Source/PythonEngine.pas

@@ -2560,6 +2560,7 @@   TPythonType = class(TGetSetContainer)
       procedure SetModule( val : TPythonModule );
       procedure SetServices( val : TTypeServices );
       procedure SetTypeName( const val : AnsiString );
+      procedure SetBaseType(AType: TPythonType);
       function  CreateMethod(pSelf, args, kwds: PPyObject): PPyObject; cdecl;
       procedure InitServices;
       procedure SetDocString( value : TStringList );
@@ -2591,6 +2592,7 @@   TPythonType = class(TGetSetContainer)
       property TheType : PyTypeObject read FType write FType;
       property TheTypePtr : PPyTypeObject read GetTypePtr;
       property PyObjectClass : TPyObjectClass read FPyObjectClass write SetPyObjectClass stored False;
+      property BaseType: TPythonType write SetBaseType;
       property InstanceCount : Integer read FInstanceCount;
       property CreateHits : Integer read FCreateHits;
       property DeleteHits : Integer read FDeleteHits;
@@ -8024,6 +8026,14 @@ procedure TPythonType.ReallocMethods;
     FType.tp_methods := MethodsData;
 end;
 
+procedure TPythonType.SetBaseType(AType: TPythonType);
+begin
+  if AType = nil then
+    FType.tp_base := nil
+  else
+    FType.tp_base := @AType.FType;
+end;
+
 procedure TPythonType.SetDocString( value : TStringList );
 begin
   FDocString.Assign( value );

Source/WrapDelphi.pas

@@ -3723,8 +3723,9 @@ procedure TPyDelphiWrapper.Notify(ADeletedObject: TObject);
 
 procedure TPyDelphiWrapper.RegisterDelphiWrapper(
   AWrapperClass: TPyDelphiObjectClass);
-Var
+var
   RegisteredClass : TRegisteredClass;
+  Index: Integer;
 begin
   Assert(Assigned(AWrapperClass));
 
@@ -3734,6 +3735,15 @@ procedure TPyDelphiWrapper.RegisterDelphiWrapper(
   RegisteredClass.PythonType.Engine := Engine;
   RegisteredClass.PythonType.Module := fModule;
   RegisteredClass.PythonType.PyObjectClass := AWrapperClass;
+  // Find nearest registered parent class and set it as base
+  for Index := fClassRegister.Count - 1 downto 0 do
+    with TRegisteredClass(fClassRegister[Index]) do
+      if RegisteredClass.DelphiClass.InheritsFrom(DelphiClass) then
+      begin
+        RegisteredClass.PythonType.BaseType := PythonType;
+        Break;
+      end;
+
   fClassRegister.Add(RegisteredClass);
   if AWrapperClass.DelphiObjectClass.InheritsFrom(TPersistent) then
     Classes.RegisterClass(TPersistentClass(AWrapperClass.DelphiObjectClass));

Source/WrapDelphiClasses.pas

@@ -1022,7 +1022,7 @@ class procedure TPyDelphiComponent.RegisterMethods(
     'Indicates whether the component has a parent to handle its filing.');
   PythonType.AddMethod('BindMethodsToEvents', @TPyDelphiComponent.BindMethodsToEvents,
     'TComponent.BindMethodsToEvents(prefix)'#10 +
-    'Connects methods to component events if they are named using the following patter: Prefix_ComponentName_EventName.'+#10+
+    'Connects methods to component events if they are named using the following pattern: Prefix_ComponentName_EventName.'+#10+
     'Example: def handle_button1_OnClick(Sender): pass'+#10+
     'The function returns a list of tuples. Each tuple contains the name of the component, the name of the event and the method object assigned to the event.'+#10+
     'Note that the prefix parameter is optional and will default to "handle_".');

Tests/WrapDelphiTest.pas

@@ -127,6 +127,8 @@   TTestWrapDelphi = class(TObject)
     procedure TestPassVariantArray;
     [Test]
     procedure TestClassRefParam;
+    [Test]
+    procedure TestInheritance;
   end;
 
 implementation
@@ -205,7 +207,7 @@ procedure TTestWrapDelphi.SetupFixture;
   Py := PyDelphiWrapper.WrapInterface(TValue.From(FTestInterface));
   DelphiModule.SetVar('rtti_interface', Py);
   PythonEngine.Py_DecRef(Py);
-  PythonEngine.ExecString('from delphi import rtti_var, rtti_rec, rtti_interface, Object, Collection, Strings');
+  PythonEngine.ExecString('from delphi import rtti_var, rtti_rec, rtti_interface, Object, Persistent, Collection, Strings');
   Rtti_Var := MainModule.rtti_var;
   Rtti_Rec := MainModule.rtti_rec;
   Rtti_Interface := MainModule.rtti_interface;
@@ -277,6 +279,17 @@ procedure TTestWrapDelphi.TestGetStaticArray;
   Assert.AreEqual(Int64(999), Int64(PythonEngine.PyObjectAsVariant(PythonEngine.PyList_GetItem(ExtractPythonObjectFrom(List), 999))));
 end;
 
+procedure TTestWrapDelphi.TestInheritance;
+var
+  Py_Strings, Py_Persistent, Py_Object: PPyObject;
+begin
+  Py_Strings := ExtractPythonObjectFrom(MainModule.Strings);
+  Py_Persistent := ExtractPythonObjectFrom(MainModule.Persistent);
+  Py_Object := ExtractPythonObjectFrom(MainModule.Object);
+  Assert.AreEqual(PythonEngine.PyObject_IsSubclass(Py_Strings, Py_Persistent), 1);
+  Assert.AreEqual(PythonEngine.PyObject_IsSubclass(Py_Strings, Py_Object), 1);
+end;
+
 procedure TTestWrapDelphi.TestInterface;
 begin
   Rtti_Interface.SetString('Test');