Workaround failure of test Tools/MacMesh/PressureValve.py

[modules/smesh.git] / src / Tools / MacMesh / MacMesh / MacObject.py

diff --git a/src/Tools/MacMesh/MacMesh/MacObject.py b/src/Tools/MacMesh/MacMesh/MacObject.py
index f2665083dca65df9ee917f8a8450ec95562b7388..becca33dc6128cb1d5acce99c35be2f18191788d 100644 (file)
--- a/src/Tools/MacMesh/MacMesh/MacObject.py
+++ b/src/Tools/MacMesh/MacMesh/MacObject.py
@@ -185,6 +185,8 @@ class MacObject:
         self.DirectionalMeshParams =  MeshPar
         self.MeshPar[0] = GenFunctions.CompatibilityTest(self)
 
+        if isinstance( self.MeshPar[0], list ):
+            return # workaround, as CompatibilityTest() can return a list
         if self.MeshPar[0] < 0 :
             Alarms.Message(4)
             if self.MeshPar[0] == -1 : print(("Problem encountered with object(s) no. "+str(ObjectsInvolved)))
@@ -209,7 +211,7 @@ class MacObject:
         """
         PtCoor = self.PtCoor
         PtCoor.append(self.PtCoor[0])
-        if type(Direction) is str :
+        if isinstance(Direction, str) :
             Dir = { 'South'  : lambda : 0,
                     'North'  : lambda : 1,
                     'West'   : lambda : 2,
@@ -226,7 +228,7 @@ class MacObject:
         The interest in using this method is for non-orthogonal objects where the sides can be
         deviated from the orthogonal basis vectors
         """
-        if type(Direction) is str :
+        if isinstance(Direction, str) :
             Dir = { 'South'  : lambda : 0,
                     'North'  : lambda : 1,
                     'West'   : lambda : 2,
@@ -241,9 +243,9 @@ class MacObject:
         import GenFunctions, Config
 
         from salome.geom import geomBuilder
-        geompy = geomBuilder.New( Config.theStudy )
+        geompy = geomBuilder.New()
 
-        if type(Criterion) is str :
+        if isinstance(Criterion, str) :
             Crit = {'South'  : lambda : 0,
                     'North'  : lambda : 1,
                     'West'   : lambda : 2,