From: rnv <rnv@opencascade.com>
Date: Fri, 29 Dec 2017 13:21:20 +0000 (+0300)
Subject: Merge changes from 'master' branch.
X-Git-Tag: V9_0_0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df48f2f8906e43a3b04e5cfb4076647890a50b95;p=modules%2Fhomard.git

Merge changes from 'master' branch.
---

df48f2f8906e43a3b04e5cfb4076647890a50b95
diff --cc src/tests/Test/test_1.py
index f9fe63ac,dd221ebc..9690918f
--- a/src/tests/Test/test_1.py
+++ b/src/tests/Test/test_1.py
@@@ -107,9 -107,9 +107,9 @@@ Python script for HOMAR
      zones_1_et_2.AddZone('Zone_1_1', 1)
      zones_1_et_2.AddZone('Zone_1_2', 1)
      laux = zones_1_et_2.GetZones()
 -    nbzone = len(laux)/2
 +    nbzone = len(laux) // 2
      jaux = 0
-     for _ in range(nbzone) :
+     for iaux in range(nbzone) :
        print(hyponame_2, " : ", dico[laux[jaux+1]], "sur la zone", laux[jaux])
        jaux += 2
      print(hyponame_2, " : champ utilisé :", zones_1_et_2.GetFieldName())
@@@ -206,7 -206,7 +206,7 @@@ try 
    if ERROR :
      raise Exception('Pb in homard_exec at iteration %d' %ERROR )
  except Exception as eee:
-   raise Exception('Pb in homard_exec: ' + str(eee))
 -  raise Exception('Pb in homard_exec: '+eee.message)
++  raise Exception('Pb in homard_exec: '+str(eee.message))
  #
  # Test of the results
  #
diff --cc src/tests/Test/test_4.py
index 971c73e7,c3d870c2..6a83c6f8
--- a/src/tests/Test/test_4.py
+++ b/src/tests/Test/test_4.py
@@@ -321,7 -321,7 +321,7 @@@ try 
    if ERROR :
      raise Exception('Pb in geom_smesh_exec')
  except Exception as eee:
-   raise Exception('Pb in geom_smesh_exec: ' + str(eee))
 -  raise Exception('Pb in geom_smesh_exec: '+eee.message)
++  raise Exception('Pb in geom_smesh_exec: '+str(eee.message))
  
  HOMARD = salome.lcc.FindOrLoadComponent('FactoryServer', 'HOMARD')
  assert HOMARD is not None, "Impossible to load homard engine"
@@@ -334,7 -334,7 +334,7 @@@ try 
    if ERROR :
      raise Exception('Pb in homard_exec at iteration %d' %ERROR )
  except Exception as eee:
-   raise Exception('Pb in homard_exec: ' + str(eee))
 -  raise Exception('Pb in homard_exec: '+eee.message)
++  raise Exception('Pb in homard_exec: '+str(eee.message))
  #
  # Test of the results
  #
diff --cc src/tests/Test/test_5.py
index 30fe52b8,1c131ce3..439426c0
--- a/src/tests/Test/test_5.py
+++ b/src/tests/Test/test_5.py
@@@ -309,7 -309,7 +309,7 @@@ try 
    if ERROR :
      raise Exception('Pb in mesh_exec')
  except Exception as eee:
-   raise Exception('Pb in mesh_exec: ' + str(eee))
 -  raise Exception('Pb in mesh_exec: '+eee.message)
++  raise Exception('Pb in mesh_exec: '+str(eee.message))
  
  HOMARD = salome.lcc.FindOrLoadComponent('FactoryServer', 'HOMARD')
  assert HOMARD is not None, "Impossible to load homard engine"
@@@ -322,7 -322,7 +322,7 @@@ try 
    if ERROR :
      raise Exception('Pb in homard_exec at iteration %d' %ERROR )
  except Exception as eee:
-   raise Exception('Pb in homard_exec: ' + str(eee))
 -  raise Exception('Pb in homard_exec: '+eee.message)
++  raise Exception('Pb in homard_exec: '+str(eee.message))
  #
  # Test of the results
  #