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

Working on setting structs

Browse Source
This commit is contained in:
Doug Blank 2013-11-12 17:18:06 -05:00
parent 8fd71fd9f0
commit 88f3cfa3f7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,8 +311,11 @@ class Struct(object):
Given a path that is already parsed, return item. Given a path that is already parsed, return item.
""" """
struct = self.struct struct = self.struct
for part in path: for p in range(len(path)):
part = path[p]
struct = self.getitem(part, struct) struct = self.getitem(part, struct)
if isinstance(struct, Struct):
return struct.getitem_from_path(path[p+1:])
if struct is None: if struct is None:
return None return None
return struct return struct
@ -346,8 +349,6 @@ class Struct(object):
return self.get_ref_struct(struct[item]) return self.get_ref_struct(struct[item])
else: else:
return None return None
elif isinstance(struct, Struct):
return self.get_ref_struct(struct[item])
elif hasattr(struct, item): elif hasattr(struct, item):
return getattr(struct, item) return getattr(struct, item)
elif item.startswith("("): elif item.startswith("("):
@ -366,7 +367,15 @@ class Struct(object):
def setitem_from_path(self, path, value): def setitem_from_path(self, path, value):
path, item = path[:-1], path[-1] path, item = path[:-1], path[-1]
struct = self.getitem_from_path(path) struct = self.struct
for p in range(len(path)):
part = path[p]
struct = self.getitem(part, struct)
if isinstance(struct, Struct):
return struct.setitem_from_path(path[p+1:], value)
if struct is None:
return None
# struct is set
if isinstance(struct, (list, tuple)): if isinstance(struct, (list, tuple)):
pos = int(item) pos = int(item)
if pos < len(struct): if pos < len(struct):
@ -376,8 +385,6 @@ class Struct(object):
struct[item] = value struct[item] = value
else: else:
raise AttributeError("no such property: '%s'" % item) raise AttributeError("no such property: '%s'" % item)
elif isinstance(struct, Struct):
struct.setitem_from_path(path, value)
elif hasattr(struct, item): elif hasattr(struct, item):
setattr(struct, item, value) setattr(struct, item, value)
else: else: