From: eficas <>
Date: Tue, 24 May 2005 07:07:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CC_param_poursuite~129
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fc52b1bc2489e733741446e691cb5d27501a3e8a;p=modules%2Feficas.git

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

diff --git a/Aster/Cata/cataSTA74/Macro/__init__.py b/Aster/Cata/cataSTA74/Macro/__init__.py
index e12f1800..4aebb58b 100644
--- a/Aster/Cata/cataSTA74/Macro/__init__.py
+++ b/Aster/Cata/cataSTA74/Macro/__init__.py
@@ -19,4 +19,3 @@
 #                                                                       
 #                                                                       
 # ======================================================================
-print 74
diff --git a/Editeur/options.py b/Editeur/options.py
index b5988c3f..4f232ffc 100644
--- a/Editeur/options.py
+++ b/Editeur/options.py
@@ -34,7 +34,7 @@ class OPTIONS:
    menu_defs=[
         ('Options',[
                    ("Affichage commandes",(("alphabétique",'&affichage_alpha'),("groupes",'&affichage_grp'))),
-                   ("Couleur",(("fond",'change_fond'),("barre",'change_barre'))),
+                   #("Couleur",(("fond",'change_fond'),("barre",'change_barre'))),
                    # ("Catalogue développeur",'choix_cata_developpeur'),
                    ]
         )
@@ -58,10 +58,9 @@ class OPTIONS:
       from tkColorChooser import askcolor
       #nouvelle=askcolor(self.appli.background)
       nouvelle=askcolor('grey')
-      print "yyyyyyyyyyyyyyyyyyyyy" 
 
    def change_barre(self):
-      print "yyyyyyyyyyyyyyyyyyyyy" 
+       pass
 
    def choix_cata_developpeur(self):
       """ 
diff --git a/Homard/eficas_homard.py b/Homard/eficas_homard.py
index a77735d1..30d38e4c 100755
--- a/Homard/eficas_homard.py
+++ b/Homard/eficas_homard.py
@@ -28,12 +28,13 @@ import sys
 
 # Modules Eficas
 import prefs
-if hasattr(prefs,'encoding'):
+prefs.code="HOMARD"
+#if hasattr(prefs,'encoding'):
    # Hack pour changer le codage par defaut des strings
-   import sys
-   reload(sys)
-   sys.setdefaultencoding(prefs.encoding)
-   del sys.setdefaultencoding
+#   import sys
+#   reload(sys)
+#   sys.setdefaultencoding(prefs.encoding)
+#   del sys.setdefaultencoding
    # Fin hack
 
 sys.path[:0]=[prefs.INSTALLDIR]
diff --git a/Noyau/N_MACRO_ETAPE.py b/Noyau/N_MACRO_ETAPE.py
index 1c680209..df5cf32f 100644
--- a/Noyau/N_MACRO_ETAPE.py
+++ b/Noyau/N_MACRO_ETAPE.py
@@ -83,6 +83,7 @@ class MACRO_ETAPE(N_ETAPE.ETAPE):
       self.actif=1
       self.sdprods=[]
       self.make_register()
+      self.UserError="UserError"
 
    def make_register(self):
       """