summaryrefslogtreecommitdiff
path: root/addons/web/common/xml2json.py
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-12-01 10:28:23 +0100
committerFabien Meghazi <fme@openerp.com>2011-12-01 10:28:23 +0100
commitce41e645f7de7e2421a2d8241d79a01a05c2bea2 (patch)
treef62b63825f22f7b5cf8bab27daaaf1724a0598c2 /addons/web/common/xml2json.py
parent740124b5fafb39ece86aed83266f4a0e8b2c5034 (diff)
[IMP] Better variable naming in xml2json
bzr revid: fme@openerp.com-20111201092823-mbwyp8tjla9k2xf3
Diffstat (limited to 'addons/web/common/xml2json.py')
-rw-r--r--addons/web/common/xml2json.py8
1 files changed, 4 insertions, 4 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