Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete items in list by assigning Null

Browse Source
This commit is contained in:
Doug Blank 2014-01-09 10:43:05 -05:00
parent 946a213fbc
commit 01da495ede
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gramps/gen/merge/diff.py
View File

@ -579,6 +579,8 @@ class Struct(object):
>>> Struct(struct).setitem_from_path(["primary_name", "surname_list", "[0]", "surname"], "Smith", transaction) >>> Struct(struct).setitem_from_path(["primary_name", "surname_list", "[0]", "surname"], "Smith", transaction)
""" """
path, item = path[:-1], path[-1] path, item = path[:-1], path[-1]
if item.startswith("["):
item = item[1:-1]
struct = self.struct struct = self.struct
primary_obj = struct primary_obj = struct
for p in range(len(path)): for p in range(len(path)):
@ -594,11 +596,19 @@ class Struct(object):
# keep track of primary object for update, below # keep track of primary object for update, below
if isinstance(struct, dict) and "_class" in struct and self.primary_object_q(struct["_class"]): if isinstance(struct, dict) and "_class" in struct and self.primary_object_q(struct["_class"]):
primary_obj = struct primary_obj = struct
# struct is set # struct is now set
if isinstance(struct, (list, tuple)): if item in struct and isinstance(struct[item], list): # assigning to a list
if value is not None:
struct[item].append(value) # we append the value
else:
struct[item] = []
elif isinstance(struct, (list, tuple)):
pos = int(item) pos = int(item)
if pos < len(struct): if pos < len(struct):
struct[int(item)] = value if value is not None:
struct[int(item)] = value
else:
struct.pop(int(item))
elif isinstance(struct, dict): elif isinstance(struct, dict):
if item in struct.keys(): if item in struct.keys():
struct[item] = value struct[item] = value