From ce41e645f7de7e2421a2d8241d79a01a05c2bea2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 1 Dec 2011 10:28:23 +0100
Subject: [PATCH] [IMP] Better variable naming in xml2json

bzr revid: fme@openerp.com-20111201092823-mbwyp8tjla9k2xf3
---
 addons/web/common/xml2json.py  | 8 ++++----
 addons/web/controllers/main.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py
index 14de0794b4d..1f2e74691b9 100644
--- a/addons/web/common/xml2json.py
+++ b/addons/web/common/xml2json.py
@@ -16,7 +16,7 @@ class Xml2Json(object):
         return Xml2Json.convert_element(root)
 
     @staticmethod
-    def convert_element(el, skip_whitespaces=True):
+    def convert_element(el, preserve_whitespaces=False):
         res = {}
         if el.tag[0] == "{":
             ns, name = el.tag.rsplit("}", 1)
@@ -28,11 +28,11 @@ class Xml2Json(object):
         for k, v in el.items():
             res["attrs"][k] = v
         kids = []
-        if el.text and (not skip_whitespaces or el.text.strip() != ''):
+        if el.text and (preserve_whitespaces or el.text.strip() != ''):
             kids.append(el.text)
         for kid in el:
-            kids.append(Xml2Json.convert_element(kid, skip_whitespaces))
-            if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
+            kids.append(Xml2Json.convert_element(kid, preserve_whitespaces))
+            if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''):
                 kids.append(kid.tail)
         res["children"] = kids
         return res
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d337fc240b5..f811f77b34c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -841,12 +841,12 @@ class View(openerpweb.Controller):
         context = req.session.eval_context(req.context)
         fvg = Model.fields_view_get(view_id, view_type, context, toolbar, submenu)
         # todo fme?: check that we should pass the evaluated context here
-        self.process_view(req.session, fvg, context, transform, (view_type != 'kanban'))
+        self.process_view(req.session, fvg, context, transform, (view_type == 'kanban'))
         if toolbar and transform:
             self.process_toolbar(req, fvg['toolbar'])
         return fvg
 
-    def process_view(self, session, fvg, context, transform, skip_whitespaces=True):
+    def process_view(self, session, fvg, context, transform, preserve_whitespaces=False):
         # depending on how it feels, xmlrpclib.ServerProxy can translate
         # XML-RPC strings to ``str`` or ``unicode``. ElementTree does not
         # enjoy unicode strings which can not be trivially converted to
@@ -864,7 +864,7 @@ class View(openerpweb.Controller):
             xml = self.transform_view(arch, session, evaluation_context)
         else:
             xml = ElementTree.fromstring(arch)
-        fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, skip_whitespaces)
+        fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces)
 
         for field in fvg['fields'].itervalues():
             if field.get('views'):