diff cagou/core/xmlui.py @ 312:772c170b47a9

Python3 port: /!\ Cagou now runs with Python 3.6+ Port has been done in the same way as for backend (check backend commit b2d067339de3 message for details).
author Goffi <goffi@goffi.org>
date Tue, 13 Aug 2019 19:14:22 +0200
parents b2727877bad4
children 7a171d11eab6
line wrap: on
line diff
--- a/cagou/core/xmlui.py	Mon Aug 05 11:21:54 2019 +0200
+++ b/cagou/core/xmlui.py	Tue Aug 13 19:14:22 2019 +0200
@@ -316,7 +316,7 @@
             while parent is not None and not isinstance(parent, AdvancedListContainer):
                 parent = parent.parent
             if parent is None:
-                log.error(u"Can't find parent AdvancedListContainer")
+                log.error("Can't find parent AdvancedListContainer")
             else:
                 if parent.selectable:
                     self.selected = parent._xmluiToggleSelected(self)
@@ -353,7 +353,7 @@
 
     def _xmluiAppend(self, widget):
         if self._current_row is None:
-            log.error(u"No row set, ignoring append")
+            log.error("No row set, ignoring append")
             return
         self._current_row.add_widget(widget)
 
@@ -589,15 +589,15 @@
             submit_btn.bind(on_press=self.onFormSubmitted)
             self.layout.add_widget(submit_btn)
             if not 'NO_CANCEL' in self.flags:
-                cancel_btn = CancelButton(text=_(u"Cancel"))
+                cancel_btn = CancelButton(text=_("Cancel"))
                 cancel_btn.bind(on_press=self.onFormCancelled)
                 self.layout.add_widget(cancel_btn)
         elif self.type == 'param':
-            self.save_btn = SaveButton(text=_(u"Save"), disabled=True)
+            self.save_btn = SaveButton(text=_("Save"), disabled=True)
             self.save_btn.bind(on_press=self._saveButtonCb)
             self.layout.add_widget(self.save_btn)
         elif self.type == 'window':
-            cancel_btn = CancelButton(text=_(u"Cancel"))
+            cancel_btn = CancelButton(text=_("Cancel"))
             cancel_btn.bind(
                 on_press=partial(self._xmluiClose, reason=C.XMLUI_DATA_CANCELLED))
             self.layout.add_widget(cancel_btn)