*** empty log message ***

diff --git a/Aster/Cata/cataSTA74/Macro/__init__.py b/Aster/Cata/cataSTA74/Macro/__init__.py
index e12f1800ea675b80fed7dc6076b8cc468e4f49e0..4aebb58b87c323b18cef5e3c2b8d4c14d8b7762a 100644 (file)
--- 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 b5988c3f7f56828dacaaa280ef768f5832273e8e..4f232ffcf781249f46367a05056a200e30e36f39 100644 (file)
--- 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 a77735d18933c42df4164c302f232e670d3d15db..30d38e4c4b14e52b425749b09a991f9b1002eab8 100755 (executable)
--- 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 1c6802099ac0872451663dcd5c98e9c1535f5dfe..df5cf32f2331e814c27d71e3dcf81281fb94e52d 100644 (file)
--- 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):
       """