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

Different in getitem depending on whether assignment, or lookup; fixed from_struct on BaseRef

Browse Source
This commit is contained in:
Doug Blank 2013-12-25 18:02:48 -05:00
parent 7224bda047
commit 6528044b1c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/gen/lib/refbase.py
View File

@ -80,7 +80,7 @@ class RefBase(object):
:returns: Returns a serialized object :returns: Returns a serialized object
""" """
return struct return str(struct)
def unserialize(self, data): def unserialize(self, data):
""" """

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

@ -343,7 +343,7 @@ def from_struct(struct):
return Note.create(Note.from_struct(struct)) return Note.create(Note.from_struct(struct))
elif struct["_class"] == "Tag": elif struct["_class"] == "Tag":
return Tag.create(Tag.from_struct(struct)) return Tag.create(Tag.from_struct(struct))
raise AttributeError("invalid struct") raise AttributeError("invalid struct: %s" % struct)
def get_dependencies(struct): def get_dependencies(struct):
""" """
@ -475,16 +475,18 @@ class Struct(object):
""" """
If the item is a handle, look up reference object. If the item is a handle, look up reference object.
""" """
if hasattr(item, "classname") and self.db: if hasattr(item, "classname") and self.db: # HandleClass
obj = self.db.get_from_name_and_handle(item.classname, str(item)) obj = self.db.get_from_name_and_handle(item.classname, str(item))
if obj: if obj:
return Struct(obj.to_struct(), self.db) return Struct(obj.to_struct(), self.db)
else: else:
return None return None
elif isinstance(item, dict):
return Struct(item, self.db)
else: else:
return item return item
def getitem(self, item, struct=None): def getitem(self, item, struct=None, ref_struct=True):
""" """
>>> Struct(struct).getitem("primary_name") >>> Struct(struct).getitem("primary_name")
{...} {...}
@ -500,7 +502,10 @@ class Struct(object):
return None return None
elif isinstance(struct, dict): elif isinstance(struct, dict):
if item in struct.keys(): if item in struct.keys():
return self.get_ref_struct(struct[item]) if ref_struct:
return self.get_ref_struct(struct[item])
else:
return struct[item]
else: else:
return None return None
elif hasattr(struct, item): elif hasattr(struct, item):
@ -524,7 +529,7 @@ class Struct(object):
struct = self.struct struct = self.struct
for p in range(len(path)): for p in range(len(path)):
part = path[p] part = path[p]
struct = self.getitem(part, struct) struct = self.getitem(part, struct, ref_struct=False) # just get dicts, no Struct
if isinstance(struct, Struct): if isinstance(struct, Struct):
return struct.setitem_from_path(path[p+1:] + [item], value, trans) return struct.setitem_from_path(path[p+1:] + [item], value, trans)
if struct is None: if struct is None: