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

Having a method used by instance or class is a bad idea

Browse Source
This commit is contained in:
Doug Blank
2015-12-30 11:03:40 -05:00
parent d1e11f4172
commit 895531c2e3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gramps/gen/lib/struct.py
View File

@@ -20,6 +20,9 @@
from gramps.gen.lib.handle import HandleClass from gramps.gen.lib.handle import HandleClass
def from_struct(struct):
return Struct.instance_from_struct(struct)
class Struct(object): class Struct(object):
""" """
Class for getting and setting parts of a struct by dotted path. Class for getting and setting parts of a struct by dotted path.
@@ -288,7 +291,7 @@ class Struct(object):
if self.db: if self.db:
if trans is None: if trans is None:
with self.transaction("Struct Update", self.db, batch=True) as trans: with self.transaction("Struct Update", self.db, batch=True) as trans:
new_obj = self.from_struct(struct) new_obj = Struct.instance_from_struct(struct)
name, handle = struct["_class"], struct["handle"] name, handle = struct["_class"], struct["handle"]
old_obj = self.db.get_from_name_and_handle(name, handle) old_obj = self.db.get_from_name_and_handle(name, handle)
if old_obj: if old_obj:
@@ -298,7 +301,7 @@ class Struct(object):
add_func = self.db._tables[name]["add_func"] add_func = self.db._tables[name]["add_func"]
add_func(new_obj, trans) add_func(new_obj, trans)
else: else:
new_obj = self.from_struct(struct) new_obj = Struct.instance_from_struct(struct)
name, handle = struct["_class"], struct["handle"] name, handle = struct["_class"], struct["handle"]
old_obj = self.db.get_from_name_and_handle(name, handle) old_obj = self.db.get_from_name_and_handle(name, handle)
if old_obj: if old_obj:
@@ -308,8 +311,11 @@ class Struct(object):
add_func = self.db._tables[name]["add_func"] add_func = self.db._tables[name]["add_func"]
add_func(new_obj, trans) add_func(new_obj, trans)
def from_struct(self):
return Struct.instance_from_struct(self.struct)
@classmethod @classmethod
def from_struct(self, struct=None): def instance_from_struct(cls, struct):
""" """
Given a struct with metadata, create a Gramps object. Given a struct with metadata, create a Gramps object.
@@ -317,8 +323,6 @@ class Struct(object):
""" """
from gramps.gen.lib import (Person, Family, Event, Source, Place, Citation, from gramps.gen.lib import (Person, Family, Event, Source, Place, Citation,
Repository, MediaObject, Note, Tag, Date) Repository, MediaObject, Note, Tag, Date)
if struct is None:
struct = self.struct
if isinstance(struct, dict): if isinstance(struct, dict):
if "_class" in struct.keys(): if "_class" in struct.keys():
if struct["_class"] == "Person": if struct["_class"] == "Person":