From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 8 Feb 2008 09:43:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_14_OT_1_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b765b391944d920db7cc4e5d5a5d83a1cad4a571;p=modules%2Feficas.git

*** empty log message ***
---

diff --git a/InterfaceTK/bureau.py b/InterfaceTK/bureau.py
index 338d2fc1..13a3ceb7 100644
--- a/InterfaceTK/bureau.py
+++ b/InterfaceTK/bureau.py
@@ -40,7 +40,10 @@ from utils import extension_fichier,stripPath,save_in_file
 from widgets import Fenetre,Ask_Format_Fichier,FenetreSurLigneWarning
 from fenetre_mc_inconnus import fenetre_mc_inconnus
 from Ihm import CONNECTOR
-from Traducteur import traduitV7V8 
+try :
+   from Traducteur import traduitV7V8 
+except :
+   pass
 
 from Editeur import comploader
 
diff --git a/Openturns/sdistOTqt.py b/Openturns/sdistOTqt.py
index a354e981..dc5f7928 100644
--- a/Openturns/sdistOTqt.py
+++ b/Openturns/sdistOTqt.py
@@ -34,6 +34,7 @@ def main():
    copyfiles('../InterfaceTK',os.path.join(path_distrib,'InterfaceTK'),['*.py','faqs.txt'])
    copyfiles('../InterfaceQT',os.path.join(path_distrib,'InterfaceQT'),['*.py','faqs.txt'])
    copyfiles('../Openturns',os.path.join(path_distrib,'Openturns'),['*.py'])
+   copyfiles('../Openturns',os.path.join(path_distrib,'Openturns'),['*.ini'])
    copyfiles('../Ihm',os.path.join(path_distrib,'Ihm'),['*.py'])
    copyfiles('../Extensions',os.path.join(path_distrib,'Extensions'),['*.py'])
    copyfiles('../Misc',os.path.join(path_distrib,'Misc'),['*.py'])
@@ -53,8 +54,8 @@ def main():
    copyfiles('../Editeur/icons',os.path.join(path_distrib,'Editeur','icons'),['*.gif'])
    copyfiles('../Editeur/Patrons',os.path.join(path_distrib,'Editeur','Patrons'),['*.com*'])
 
-   copyfiles('../Noyau'),os.path.join(path_distrib,'Noyau'),['*.py'])
-   copyfiles('../Validation'),os.path.join(path_distrib,'Validation'),['*.py'])
+   copyfiles('../Noyau',os.path.join(path_distrib,'Noyau'),['*.py'])
+   copyfiles('../Validation',os.path.join(path_distrib,'Validation'),['*.py'])
 
    copyfiles('../Tools',os.path.join(path_distrib,'Tools'),['*.py'])
    copyfiles('../Tools/foztools',os.path.join(path_distrib,'Tools','foztools'),['*.py'])
@@ -69,7 +70,6 @@ def main():
    except:
       print "Repertoire de download inconnu : ",dir_download
 
-   shutil.copy('prefs.py.win',os.path.join(path_distrib,'Aster','prefs.py'))
 
    try:
       shutil.copytree(path_TextTools,os.path.join(path_distrib,'Tools','TextTools'))
diff --git a/generator/OpenturnsBase.py b/generator/OpenturnsBase.py
index 4f85d50c..fee46c7d 100644
--- a/generator/OpenturnsBase.py
+++ b/generator/OpenturnsBase.py
@@ -72,7 +72,7 @@ class Generateur :
 
     
     tuple_solver = None
-    if self.InformationSolverVariable.has_key(Solver) :
+    if self.InformationSolverVariable.has_key("Solver") :
       tuple_solver = self.InformationSolverVariable[Solver]
 
     # On va parcourir toutes les variables de la liste. Le dictionnaire les caracterisant