Pour enlever Utilitai

diff --git a/Aster/Cata/cataSTA7/ops.py b/Aster/Cata/cataSTA7/ops.py
index 89963674510a2b2fede2e4b13f8c30c3fded8266..b4cbbca3421396ca023e0c0a8fcbc39c4d06456d 100644 (file)
--- 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 ce3bf2b5c406ac79d71db78633fe1a12961d6198..44cebeccc4c089cf0a10a1d8b5711ea5ccc3dd76 100644 (file)
--- 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 7a4bedb3ce94ba9efb9ae65774481bb8b7e50fa5..ec37741744087b4e56aae379b82cbf25eb7d0d84 100644 (file)
--- 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 6fb9a32fff37f423d10a5d596d5b69a013441187..e97053c118d252910878e3a30be6a9736591046c 100644 (file)
--- 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 6e6ab0f7393fbc2cfa48ede6eef7fe69f66056b0..6a3e9c198e6434e6cf8ef287ce9a0725fd8d2f42 100644 (file)
--- 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 ce3bf2b5c406ac79d71db78633fe1a12961d6198..44cebeccc4c089cf0a10a1d8b5711ea5ccc3dd76 100644 (file)
--- 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 7a4bedb3ce94ba9efb9ae65774481bb8b7e50fa5..53aba950abff787f661f560a3ecaa103128c0b0b 100644 (file)
--- 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 6fb9a32fff37f423d10a5d596d5b69a013441187..d694fd6a15c09efe7f38066581c029e8847eeb99 100644 (file)
--- 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 8a909c5ac813ef81618a020363198cbaeeaa2a67..4c9249a128045280219a63367afc4e1b67e256ce 100644 (file)
--- 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 b51e596b8e12b5c0478b07ede808eaa698cc8796..af1cf5cf345980e80b2242fbae8f034dec3420d4 100644 (file)
--- 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'])