merge upstream

bzr revid: chs@openerp.com-20121011093252-ke83ln88kw9em5y6

1 files changed, 0 insertions, 26 deletions

diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py
deleted file mode 100644
index df3aad67fa5..00000000000
--- a/addons/web/common/xml2json.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# xml2json-direct
-# Simple and straightforward XML-to-JSON converter in Python
-# New BSD Licensed
-#
-# URL: http://code.google.com/p/xml2json-direct/
-
-def from_elementtree(el, preserve_whitespaces=False):
-    res = {}
-    if el.tag[0] == "{":
-        ns, name = el.tag.rsplit("}", 1)
-        res["tag"] = name
-        res["namespace"] = ns[1:]
-    else:
-        res["tag"] = el.tag
-    res["attrs"] = {}
-    for k, v in el.items():
-        res["attrs"][k] = v
-    kids = []
-    if el.text and (preserve_whitespaces or el.text.strip() != ''):
-        kids.append(el.text)
-    for kid in el:
-        kids.append(from_elementtree(kid, preserve_whitespaces))
-        if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''):
-            kids.append(kid.tail)
-    res["children"] = kids
-    return res