Skip to content

Add support for HTML attributes #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oriolpiera wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for HTML attributes #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions dicttoxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,23 @@ def convert_dict(obj, ids, parent, attr_type, item_func, cdata):

if isinstance(val, numbers.Number) or type(val) in (str, unicode):
addline(convert_kv(key, val, attr_type, attr, cdata))

elif isinstance(val, dict) and has_attributes(val):
new_attribute = val['dicttoxml_attributes']
new_content = val['dicttoxml_content']
if isinstance(new_content, dict):
addline('<%s%s>%s</%s>' % (
key, make_attrstring(new_attribute),
convert_dict(new_content, ids, key, attr_type, item_func, cdata),
key
)
)
else:
addline('<%s%s>%s</%s>' % (
key, make_attrstring(new_attribute),
new_content,
key
)
)
elif hasattr(val, 'isoformat'): # datetime
addline(convert_kv(key, val.isoformat(), attr_type, attr, cdata))

Expand Down Expand Up @@ -253,6 +269,8 @@ def convert_dict(obj, ids, parent, attr_type, item_func, cdata):

return ''.join(output)

def has_attributes(val):
return 'dicttoxml_attributes' in val.keys() and 'dicttoxml_content' in val.keys()

def convert_list(items, ids, parent, attr_type, item_func, cdata):
"""Converts a list into an XML string."""
Expand Down Expand Up @@ -280,7 +298,10 @@ def convert_list(items, ids, parent, attr_type, item_func, cdata):
addline(convert_bool(item_name, item, attr_type, attr, cdata))

elif isinstance(item, dict):
if not attr_type:
(k, v), = item.items()
if has_attributes(v):
addline(convert_dict(item, ids, parent, attr_type, item_func, cdata))
elif not attr_type:
addline('<%s>%s</%s>' % (
item_name,
convert_dict(item, ids, parent, attr_type, item_func, cdata),
Expand Down