bugfix
This commit is contained in:
parent
2cc200f60f
commit
a5987bfd56
@ -1,4 +1,22 @@
|
||||
|
||||
def arrayExtend(s,addon):
|
||||
ret = []
|
||||
s_cnt = len(s)
|
||||
a_cnt = len(addon)
|
||||
for i,v in enumerate(addon):
|
||||
if i < s_cnt:
|
||||
if type(v)!=type(s[i]):
|
||||
ret.append(v)
|
||||
continue
|
||||
if isinstance(v,dict):
|
||||
x = dictExtend(v,s[i])
|
||||
ret.append(x)
|
||||
continue
|
||||
ret.append(v)
|
||||
if s_cnt < a_cnt:
|
||||
ret += s[i:]
|
||||
return ret
|
||||
|
||||
def dictExtend(s,addon):
|
||||
ret = {}
|
||||
ret.update(s)
|
||||
@ -14,7 +32,7 @@ def dictExtend(s,addon):
|
||||
ret[k] = dictExtend(ret[k],v)
|
||||
continue
|
||||
if type(v)==type([]):
|
||||
ret[k] = ret[k] + v
|
||||
ret[k] = arrayExtend(ret[k],v)
|
||||
continue
|
||||
ret[k] = v
|
||||
return ret
|
||||
|
Loading…
Reference in New Issue
Block a user