[PY3] Fix some MRO issues

This commit is contained in:
Nicolas Geimer 2017-03-20 18:01:59 +01:00
parent 5260bd00bd
commit 1286bbe881
4 changed files with 8 additions and 8 deletions

View File

@ -478,7 +478,7 @@ module SMESH
/*!
* Filter
*/
interface Filter: SALOME::GenericObj, SMESH_IDSource
interface Filter: SMESH_IDSource
{
/*!
* Structure containing information about one criterion

View File

@ -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

View File

@ -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
{
/*!
*

View File

@ -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.