Python 3 compatibility improvement (encoding)

diff --git a/src/daEficas/prefs_ADAO.py.in b/src/daEficas/prefs_ADAO.py.in
index 041554a0cf00b04e34505f373ef5b752f3f933f1..f7db3b4ce765209faee9afe1b7a030573ff0775c 100644 (file)
--- a/src/daEficas/prefs_ADAO.py.in
+++ b/src/daEficas/prefs_ADAO.py.in
@@ -48,7 +48,7 @@ initialdir=os.environ["PWD"]
 if sys.version.split()[0] < '3':
     # ===== Specifique : redefinition de l'encoding avant le Python 3 ! JPA
     reload(sys)
-    sys.setdefaultencoding('latin1')
+    sys.setdefaultencoding('utf-8')
     # ===== Specifique : pour les suivantes 8_x ! Enlever pour les 9_x ! JPA
     # 19/05/2017 : Redefinition du hook de "sys" present dans <GUI/src/SUITApp/SUITApp_init_python.cxx>
     def _custom_except_hook(exc_type, exc_value, exc_traceback):
@@ -70,4 +70,5 @@ closeFrameRechercheCommande = True
 closeEntete = True
 closeArbre = True
 taille = 800
+nombreDeBoutonParLigne = 2
 

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 9020be392f59efd6f85fb4bff80c536d07a28a7b..1324e49e26c355c7c178db5cc63aa737fbd1b11f 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -181,7 +181,7 @@ class AdaoEficasWrapper(eficasSalome.MyEficas):
 #
 #######
 
-    def addEWObserver(self, observer):
+    def addObserver(self, observer):
         """
         In fact, only one observer may be defined for the moment.
         """