Yaltik/hy_odoo
2
0
Fork 0
Code Issues Pull Requests Releases Activity

[FIX]XML Base : fix unicode / str py2/3 difference

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2021-02-22 01:01:21 +01:00
parent d5884da16b
commit 24fc3f4807
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hy_odoo/xml_base.hy
View File

@ -42,8 +42,10 @@
(cond [(string? children) (setv (. parent text) children)] (cond [(string? children) (setv (. parent text) children)]
[(instance? XMLDictElement children [(instance? XMLDictElement children
(do (do
(setv attrs (dfor [k v] (.items (. children attrs)) [(unicode k) (unicode v)]) (if-python2
new-parent (.SubElement ET parent (. children tag) attrs) (setv attrs (dfor [k v] (.items (. children attrs)) [(unicode k) (unicode v)]))
(setv attrs (dfor [k v] (.items (. children attrs)) [(str k) (str v)])))
(setv new-parent (.SubElement ET parent (. children tag) attrs)
subchildren (.children children)) subchildren (.children children))
(when subchildren) (xmlchild new-parent subchildren)))] (when subchildren) (xmlchild new-parent subchildren)))]
[(instance? list children) (list( map (partial xmlchild parent) children))] [(instance? list children) (list( map (partial xmlchild parent) children))]
@ -52,8 +54,9 @@
(defn xmln [&optional [tag ""] [attrs {}] [children []]] (defn xmln [&optional [tag ""] [attrs {}] [children []]]
"XMLDictElement building from dict object, with defaults" "XMLDictElement building from dict object, with defaults"
(when (instance? list attrs) (setv children attrs attrs {})) (when (instance? list attrs) (setv children attrs attrs {}))
(setv xmldictel (partial XMLDictElement tag attrs)) (setv xmldictel (partial XMLDictElement tag attrs)
(when (instance? unicode children) (return (xmldictel [children]))) inst-str? (if-python2 (instance? unicode children) (instance? str children)))
(when inst-str? (return (xmldictel [children])))
(when (instance? list children) (return (xmldictel children))) (when (instance? list children) (return (xmldictel children)))
(raise (TypeError "Invalid arguments for xmln"))) (raise (TypeError "Invalid arguments for xmln")))