From b2f32986be4a05dc70c1bc1ae48b70f9fdc445ea Mon Sep 17 00:00:00 2001
From: souliane <souliane@mailoo.org>
Date: Tue, 25 Feb 2014 10:59:05 +0100
Subject: [PATCH] frontends: fix typos, do not use logging in the xmlui tools:

---
 frontends/src/jp/base.py     |  2 +-
 frontends/src/tools/xmlui.py | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/frontends/src/jp/base.py b/frontends/src/jp/base.py
index 66ff70c0..a26c0bea 100644
--- a/frontends/src/jp/base.py
+++ b/frontends/src/jp/base.py
@@ -78,7 +78,7 @@ class Jp(object):
         except exceptions.BridgeExceptionNoService:
             print(_(u"Can't connect to SàT backend, are you sure it's launched ?"))
             sys.exit(1)
-        except excpetions.BridgeInitError:
+        except exceptions.BridgeInitError:
             print(_(u"Can't init bridge"))
             sys.exit(1)
 
diff --git a/frontends/src/tools/xmlui.py b/frontends/src/tools/xmlui.py
index 9a69343b..31fdb59e 100644
--- a/frontends/src/tools/xmlui.py
+++ b/frontends/src/tools/xmlui.py
@@ -19,7 +19,7 @@
 
 from sat.core.i18n import _
 from sat_frontends.constants import Const
-from logging import debug, info, warning, error
+from sat.core.exceptions import DataError
 
 
 class InvalidXMLUI(Exception):
@@ -237,7 +237,7 @@ class XMLUI(object):
 
                     self._parseChilds(cont, node, ('row',), data)
                 else:
-                    warning(_("Unknown container [%s], using default one") % type_)
+                    print(_("Unknown container [%s], using default one") % type_)
                     cont = self.widget_factory.createVerticalContainer(parent)
                     self._parseChilds(cont, node, ('widget', 'container'))
                 try:
@@ -312,7 +312,7 @@ class XMLUI(object):
                     ctrl = self.widget_factory.createButtonWidget(parent, value, self.onButtonPress)
                     ctrl._xmlui_param_id = (callback_id,[field.getAttribute('name') for field in node.getElementsByTagName("field_back")])
                 else:
-                    error(_("FIXME FIXME FIXME: widget type [%s] is not implemented") % type_)
+                    print(_("FIXME FIXME FIXME: widget type [%s] is not implemented") % type_)
                     raise NotImplementedError(_("FIXME FIXME FIXME: type [%s] is not implemented") % type_)
 
                 if self.type == 'param':
@@ -321,7 +321,7 @@ class XMLUI(object):
                         ctrl._param_category = self._current_category
                     except (AttributeError, TypeError): # XXX: TypeError is here because pyjamas raise a TypeError instead of an AttributeError
                         if not isinstance(ctrl, (EmptyWidget, TextWidget, LabelWidget, JidWidget)):
-                            warning(_("No change listener on [%s]" % ctrl))
+                            print(_("No change listener on [%s]") % ctrl)
 
                 ctrl._xmlui_name = name
                 parent._xmluiAppend(ctrl)
@@ -384,7 +384,7 @@ class XMLUI(object):
             try:
                 name = self.escape(wid._xmlui_name)
                 value = wid._xmluiGetValue()
-                ret[name] = value
+                data[name] = value
             except (AttributeError, TypeError): # XXX: TypeError is here because pyjamas raise a TypeError instead of an AttributeError
                 pass
         idx = ctrl._xmluiGetSelectedIndex()
@@ -392,7 +392,7 @@ class XMLUI(object):
             data['index'] = idx
         callback_id = ctrl._xmlui_callback_id
         if callback_id is None:
-            warning(_("No callback_id found"))
+            print(_("No callback_id found"))
             return
         self._xmluiLaunchAction(callback_id, data)
 
@@ -433,15 +433,14 @@ class XMLUI(object):
             self._xmluiLaunchAction(self.submit_id, data)
 
         else:
-            warning (_("The form data is not sent back, the type is not managed properly"))
+            print(_("The form data is not sent back, the type is not managed properly"))
         self._xmluiClose()
 
     def onFormCancelled(self, ignore=None):
         """ Called when a form is cancelled """
-        debug(_("Cancelling form"))
+        print(_("Cancelling form"))
         self._xmluiClose()
 
-
     def onSaveParams(self, ignore=None):
         """ Params are saved, we send them to backend
         self.type must be param