Merge remote-tracking branch 'origin/V8_3_BR' into gdd/python3_dev

diff --git a/bin/runATOMSOLV.in b/bin/runATOMSOLV.in
index c4460737a0d8e38225a6d2e8677a046b582ab416..a2d30e1576e36b9154af4406aa33f1ebe7be912a 100755 (executable)
--- a/bin/runATOMSOLV.in
+++ b/bin/runATOMSOLV.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
@@ -39,7 +39,7 @@ searchFreePort() {
             local myhost=`hostname`
             export OMNIORB_CONFIG=${HOME}/.omniORB_${myhost}_${NSPORT}.cfg
             local initref="NameService=corbaname::"`hostname`":$NSPORT"
-            if [[ `python -c "import CORBA; print CORBA.ORB_ID"` = "omniORB4" ]]; then
+            if [[ `python3 -c "import CORBA; print(CORBA.ORB_ID)"` = "omniORB4" ]]; then
                 echo "InitRef = $initref" > $OMNIORB_CONFIG
             else
                 echo "ORBInitRef $initref" > $OMNIORB_CONFIG
@@ -60,4 +60,4 @@ searchFreePort() {
 searchFreePort
 
 
-${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $ATOMSOLV_ROOT_DIR/bin/salome/runATOMSOLV.py --modules=ATOMGEN,ATOMSOLV --killall
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python3 -i $ATOMSOLV_ROOT_DIR/bin/salome/runATOMSOLV.py --modules=ATOMGEN,ATOMSOLV --killall

diff --git a/bin/runATOMSOLV.py b/bin/runATOMSOLV.py
index baac0317880d726f76b7a983db84f2181e9533c6..420d397f2c364af42d85d74431e4a1e85f38fd60 100755 (executable)
--- a/bin/runATOMSOLV.py
+++ b/bin/runATOMSOLV.py
@@ -34,7 +34,6 @@ def test(clt):
 #
 
 if __name__ == "__main__":
-   import user
    from runSalome import *
    clt,args = main()
    
@@ -43,8 +42,8 @@ if __name__ == "__main__":
    #
    
    if clt != None:
-     print
-     print " --- registered objects tree in Naming Service ---"
+     print()
+     print(" --- registered objects tree in Naming Service ---")
      clt.showNS()
      session=clt.waitNS("/Kernel/Session")
      catalog=clt.waitNS("/Kernel/ModulCatalog")