From d12d82353d57b6b2fc8747e534a75a36064685c1 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 11 Jun 2007 15:06:35 +0000 Subject: [PATCH] Pour enlever Utilitai --- Aster/Cata/cataSTA7/ops.py | 2 +- Aster/Cata/cataSTA8/Macro/impr_oar_ops.py | 9 ++++++--- Aster/Cata/cataSTA8/Macro/macr_ascouf_mail_ops.py | 5 ++++- Aster/Cata/cataSTA8/Macro/macr_spectre_ops.py | 5 ++++- Aster/Cata/cataSTA8/ops.py | 2 +- Aster/Cata/cataSTA9/Macro/impr_oar_ops.py | 9 ++++++--- Aster/Cata/cataSTA9/Macro/macr_ascouf_mail_ops.py | 7 +++++-- Aster/Cata/cataSTA9/Macro/macr_spectre_ops.py | 7 +++++-- Aster/Cata/cataSTA9/ops.py | 6 +++--- Aster/sdist.py | 2 +- 10 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Aster/Cata/cataSTA7/ops.py b/Aster/Cata/cataSTA7/ops.py index 89963674..b4cbbca3 100644 --- a/Aster/Cata/cataSTA7/ops.py +++ b/Aster/Cata/cataSTA7/ops.py @@ -27,9 +27,9 @@ import pickle # Modules Eficas import Accas from Accas import ASSD -from Utilitai.Utmess import UTMESS try: + from Utilitai.Utmess import UTMESS import aster # Si le module aster est présent, on le connecte # au JDC diff --git a/Aster/Cata/cataSTA8/Macro/impr_oar_ops.py b/Aster/Cata/cataSTA8/Macro/impr_oar_ops.py index ce3bf2b5..44cebecc 100644 --- a/Aster/Cata/cataSTA8/Macro/impr_oar_ops.py +++ b/Aster/Cata/cataSTA8/Macro/impr_oar_ops.py @@ -19,9 +19,12 @@ # ====================================================================== import aster -from Utilitai.Utmess import UTMESS -from Utilitai.Table import Table -from Utilitai.partition import MAIL_PY +try : + from Utilitai.Utmess import UTMESS + from Utilitai.Table import Table + from Utilitai.partition import MAIL_PY +except : + pass def buildTabString(tabLevel): """ diff --git a/Aster/Cata/cataSTA8/Macro/macr_ascouf_mail_ops.py b/Aster/Cata/cataSTA8/Macro/macr_ascouf_mail_ops.py index 7a4bedb3..ec377417 100644 --- a/Aster/Cata/cataSTA8/Macro/macr_ascouf_mail_ops.py +++ b/Aster/Cata/cataSTA8/Macro/macr_ascouf_mail_ops.py @@ -23,7 +23,10 @@ import os.path from math import sqrt,cos,sin,pi,tan,log,fabs,ceil,fmod,floor import aster import string -from Utilitai.Utmess import UTMESS +try : + from Utilitai.Utmess import UTMESS +except : + pass # ------------------------------------------------------------------------------ def ASCFON(RC,RM,EP,ORIEN,AZIM,AXEC,POS,Y): diff --git a/Aster/Cata/cataSTA8/Macro/macr_spectre_ops.py b/Aster/Cata/cataSTA8/Macro/macr_spectre_ops.py index 6fb9a32f..e97053c1 100644 --- a/Aster/Cata/cataSTA8/Macro/macr_spectre_ops.py +++ b/Aster/Cata/cataSTA8/Macro/macr_spectre_ops.py @@ -21,7 +21,10 @@ from Accas import _F import aster import string -from Utilitai.Utmess import UTMESS +try : + from Utilitai.Utmess import UTMESS +except : + pass def macr_spectre_ops(self,MAILLAGE,PLANCHER,NOM_CHAM,CALCUL,RESU,IMPRESSION=None, FREQ=None,LIST_FREQ=None,LIST_INST=None,AMOR_SPEC=None,**args): """ diff --git a/Aster/Cata/cataSTA8/ops.py b/Aster/Cata/cataSTA8/ops.py index 6e6ab0f7..6a3e9c19 100644 --- a/Aster/Cata/cataSTA8/ops.py +++ b/Aster/Cata/cataSTA8/ops.py @@ -27,7 +27,6 @@ import pickle # Modules Eficas import Accas from Accas import ASSD -from Utilitai.Utmess import UTMESS try: import aster @@ -35,6 +34,7 @@ try: # au JDC import Build.B_CODE Build.B_CODE.CODE.codex=aster + from Utilitai.Utmess import UTMESS except: pass diff --git a/Aster/Cata/cataSTA9/Macro/impr_oar_ops.py b/Aster/Cata/cataSTA9/Macro/impr_oar_ops.py index ce3bf2b5..44cebecc 100644 --- a/Aster/Cata/cataSTA9/Macro/impr_oar_ops.py +++ b/Aster/Cata/cataSTA9/Macro/impr_oar_ops.py @@ -19,9 +19,12 @@ # ====================================================================== import aster -from Utilitai.Utmess import UTMESS -from Utilitai.Table import Table -from Utilitai.partition import MAIL_PY +try : + from Utilitai.Utmess import UTMESS + from Utilitai.Table import Table + from Utilitai.partition import MAIL_PY +except : + pass def buildTabString(tabLevel): """ diff --git a/Aster/Cata/cataSTA9/Macro/macr_ascouf_mail_ops.py b/Aster/Cata/cataSTA9/Macro/macr_ascouf_mail_ops.py index 7a4bedb3..53aba950 100644 --- a/Aster/Cata/cataSTA9/Macro/macr_ascouf_mail_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macr_ascouf_mail_ops.py @@ -21,9 +21,12 @@ import os.path from math import sqrt,cos,sin,pi,tan,log,fabs,ceil,fmod,floor -import aster import string -from Utilitai.Utmess import UTMESS +try : + import aster + from Utilitai.Utmess import UTMESS +except : + pass # ------------------------------------------------------------------------------ def ASCFON(RC,RM,EP,ORIEN,AZIM,AXEC,POS,Y): diff --git a/Aster/Cata/cataSTA9/Macro/macr_spectre_ops.py b/Aster/Cata/cataSTA9/Macro/macr_spectre_ops.py index 6fb9a32f..d694fd6a 100644 --- a/Aster/Cata/cataSTA9/Macro/macr_spectre_ops.py +++ b/Aster/Cata/cataSTA9/Macro/macr_spectre_ops.py @@ -19,9 +19,12 @@ # ====================================================================== from Accas import _F -import aster +try : + import aster + from Utilitai.Utmess import UTMESS +except : + pass import string -from Utilitai.Utmess import UTMESS def macr_spectre_ops(self,MAILLAGE,PLANCHER,NOM_CHAM,CALCUL,RESU,IMPRESSION=None, FREQ=None,LIST_FREQ=None,LIST_INST=None,AMOR_SPEC=None,**args): """ diff --git a/Aster/Cata/cataSTA9/ops.py b/Aster/Cata/cataSTA9/ops.py index 8a909c5a..4c9249a1 100644 --- a/Aster/Cata/cataSTA9/ops.py +++ b/Aster/Cata/cataSTA9/ops.py @@ -27,12 +27,12 @@ import pickle # Modules Eficas import Accas from Accas import ASSD -from Utilitai.Utmess import UTMESS -from Utilitai.as_timer import ASTER_TIMER -from Utilitai.Sensibilite import MEMORISATION_SENSIBILITE from Noyau.ascheckers import CheckLog try: + from Utilitai.Utmess import UTMESS + from Utilitai.as_timer import ASTER_TIMER + from Utilitai.Sensibilite import MEMORISATION_SENSIBILITE import aster # Si le module aster est présent, on le connecte # au JDC diff --git a/Aster/sdist.py b/Aster/sdist.py index b51e596b..af1cf5cf 100644 --- a/Aster/sdist.py +++ b/Aster/sdist.py @@ -56,7 +56,7 @@ def main(): ]) # Les Catalogues, Macros, Materiaux et SD - copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py']) + #copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py']) copyfiles('Cata/pre74',os.path.join(path_distrib,'Aster','Cata','pre74'),['*.py']) copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py']) -- 2.39.2