[PY3] Fix some MRO issues

diff --git a/idl/SMESH_Filter.idl b/idl/SMESH_Filter.idl
index c354e064d8fa26db7e34bf8072baad3bcf98e64c..b71cf922f75f115f445d0d40b11fc68d83bfacab 100644 (file)
--- a/idl/SMESH_Filter.idl
+++ b/idl/SMESH_Filter.idl
@@ -478,7 +478,7 @@ module SMESH
   /*!
   *  Filter
   */
-  interface Filter: SALOME::GenericObj, SMESH_IDSource
+  interface Filter: SMESH_IDSource
   {
     /*!
     * Structure containing information about one criterion

diff --git a/idl/SMESH_Group.idl b/idl/SMESH_Group.idl
index e5e533d18c67d850c1c748520c5351c393a61f3f..71a256525ace6ee46303283edfe9deb391ce7fea 100644 (file)
--- a/idl/SMESH_Group.idl
+++ b/idl/SMESH_Group.idl
@@ -41,7 +41,7 @@ module SMESH
   /*!
    * SMESH_Group: base interface of group object
    */
-  interface SMESH_GroupBase : SALOME::GenericObj, SMESH_IDSource
+  interface SMESH_GroupBase : SMESH_IDSource
   {
     /*!
      * Sets group name

diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl
index 805b21df68590e0e04a7c16b1de072b6bd6eba82..2246473ead9fd12097744bc7332de2f2f2b708b0 100644 (file)
--- a/idl/SMESH_Mesh.idl
+++ b/idl/SMESH_Mesh.idl
@@ -340,7 +340,7 @@ module SMESH
   typedef sequence<SMESH_subMesh>     submesh_array;
   typedef sequence<submesh_array>     submesh_array_array;
 
-  interface SMESH_Mesh : SALOME::GenericObj, SMESH_IDSource
+  interface SMESH_Mesh : SMESH_IDSource
   {
     /*!
      * Return true if there is a geometry to be meshed
@@ -1017,7 +1017,7 @@ module SMESH
     string_array GetLastParameters();
   };
 
-  interface SMESH_subMesh : SALOME::GenericObj, SMESH_IDSource
+  interface SMESH_subMesh : SMESH_IDSource
   {
     /*!
      *

diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py
index 62b98a8168b2cd9a4c012899aae7052072409dce..cb3244dafa69a9146da5fb28d63bf045bd3a2f88 100644 (file)
--- a/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@ -314,7 +314,7 @@ created = False
 ## This class allows to create, load or manipulate meshes.
 #  It has a set of methods to create, load or copy meshes, to combine several meshes, etc.
 #  It also has methods to get infos and measure meshes.
-class smeshBuilder(object, SMESH._objref_SMESH_Gen):
+class smeshBuilder(SMESH._objref_SMESH_Gen):
 
     # MirrorType enumeration
     POINT = SMESH_MeshEditor.POINT
@@ -333,7 +333,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
     # Methods of splitting a hexahedron into tetrahedra
     Hex_5Tet, Hex_6Tet, Hex_24Tet, Hex_2Prisms, Hex_4Prisms = 1, 2, 3, 1, 2
 
-    def __new__(cls):
+    def __new__(cls, *args):
         global engine
         global smeshInst
         global doLcc
@@ -370,12 +370,12 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
         #print "====2 ", smeshInst
         return smeshInst
 
-    def __init__(self):
+    def __init__(self, *args):
         global created
         #print "--------------- smeshbuilder __init__ ---", created
         if not created:
             created = True
-            SMESH._objref_SMESH_Gen.__init__(self)
+            SMESH._objref_SMESH_Gen.__init__(self, *args)
 
     ## Dump component to the Python script
     #  This method overrides IDL function to allow default values for the parameters.