From: vsr <vsr@opencascade.com>
Date: Fri, 28 Sep 2007 06:31:32 +0000 (+0000)
Subject: Fix small problem with --execute command line option for runSalome script: the .py... 
X-Git-Tag: V4_1_0a1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8f8386d0a2b78b135c9eb5a7a25f7c72bab959a4;p=modules%2Fgui.git

Fix small problem with --execute command line option for runSalome script: the .py extension should be removed from the script name when using "import <script>" command to avoid error message "Import error: no module named py"
---

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 93f1e10aa..3e019b7f6 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -196,7 +196,7 @@ void SalomeApp_Application::start()
 	    PythonConsole* pyConsole = pythonConsole();
 	    if ( pyConsole ) {
               QString extension = fi.extension( false ).lower();
-              if ( extension == "py" && fi.exists() ) {
+              if ( fi.exists() ) {
                 // execute python script
                 QString command = QString( "execfile(\"%1\")" ).arg( fi.absFilePath() );
                 pyConsole->exec( command );
@@ -204,7 +204,8 @@ void SalomeApp_Application::start()
               else {
                 // import python module
                 QString command = QString( "import %1" ).arg( pyfiles[j] );
-                //QString command = QString( "import %1" ).arg( fi.baseName( true ) );
+		if ( extension == "py" )
+		  command = QString( "import %1" ).arg( fi.baseName( true ) );
                 pyConsole->exec( command );
               }
             }