Skip to content

Fix bug that list item failed to keep original order and dict item failed to save its all items #21

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
dalang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bug that list item failed to keep original order and dict item failed to save its all items #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7152bd0
Fix bug that list item in json failed to keep original order and dict…
dalang Jun 12, 2016
10f1e4f
Fix ci failed in python 2.6.9
dalang Jun 12, 2016
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
32 changes: 27 additions & 5 deletions splitjson/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,24 @@
from django.forms.utils import flatatt


def merge_dicts(src_dict, dst_dict):
for k, v in src_dict.items():
if k not in dst_dict:
dst_dict[k] = v
else:
if type(v) == type(dst_dict[k]):
if isinstance(v, dict):
merge_dicts(v, dst_dict[k])
elif isinstance(v, list):
dst_dict[k].extend(v)
else:
dst_dict[k] = v
else:
dst_dict[k] = v

return dst_dict


class SplitJSONWidget(forms.Widget):

def __init__(self, attrs=None, newline='<br/>\n', sep='__', debug=False):
Expand Down Expand Up @@ -72,9 +90,11 @@ def _prepare_as_ul(self, l):

def _to_pack_up(self, root_node, raw_data):

copy_raw_data = copy.deepcopy(raw_data)
result = []

ordered_keys = sorted(raw_data.keys())
copy_raw_data = copy.deepcopy(raw_data)

def _to_parse_key(k, v):
if k.find(self.separator) != -1:
apx, _, nk = k.rpartition(self.separator)
Expand All @@ -84,8 +104,10 @@ def _to_parse_key(k, v):
l = []
obj = {}
index = None
l.append(v)
if apx != root_node:
for key, val in copy_raw_data.items():
for key in [ok for ok in ordered_keys if ok in copy_raw_data]:
val = copy_raw_data[key]
head, _, t = key.rpartition(self.separator)
_, _, index = head.rpartition(self.separator)
if key is k:
Expand All @@ -103,7 +125,6 @@ def _to_parse_key(k, v):
if obj:
for i in obj:
l.append(obj[i])
l.append(v)
return _to_parse_key(apx, l)
except ValueError:
# parse dict
Expand All @@ -128,7 +149,8 @@ def _to_parse_key(k, v):
else:
return v

for k, v in raw_data.iteritems():
for k in ordered_keys:
v = raw_data[k]
if k in copy_raw_data:
# to transform value from list to string
v = v[0] if isinstance(v, list) and len(v) is 1 else v
Expand All @@ -140,7 +162,7 @@ def _to_parse_key(k, v):
try:
result.extend(d)
except:
result.update(d)
merge_dicts(d, result)
return result

def value_from_datadict(self, data, files, name):
Expand Down