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

9547: Rename another non-API database method

Browse Source
This commit is contained in:
Nick Hall 2016-06-25 21:40:04 +01:00
parent ebc91f17f2
commit 72ca67e7c9
4 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gen/db/base.py
View File

@ -358,12 +358,6 @@ class DbReadBase:
""" """
raise NotImplementedError raise NotImplementedError
def get_from_handle(self, handle, class_type, data_map):
"""
Return unserialized data from database given handle and object class
"""
raise NotImplementedError
def get_gramps_ids(self, obj_key): def get_gramps_ids(self, obj_key):
""" """
Returns all the keys from a table given a table name Returns all the keys from a table given a table name

22
gramps/plugins/database/bsddb_support/read.py
View File

@ -723,7 +723,7 @@ class DbBsddbRead(DbReadBase, Callback):
self.nmap_index, self.nid_trans) self.nmap_index, self.nid_trans)
return gid return gid
def get_from_handle(self, handle, class_type, data_map): def _get_from_handle(self, handle, class_type, data_map):
if isinstance(handle, str): if isinstance(handle, str):
handle = handle.encode('utf-8') handle = handle.encode('utf-8')
data = data_map.get(handle) data = data_map.get(handle)
@ -768,7 +768,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Person exists, a HandleError is raised. If no such Person exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Person, self.person_map) return self._get_from_handle(handle, Person, self.person_map)
def get_source_from_handle(self, handle): def get_source_from_handle(self, handle):
""" """
@ -776,7 +776,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Source exists, a HandleError is raised. If no such Source exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Source, self.source_map) return self._get_from_handle(handle, Source, self.source_map)
def get_citation_from_handle(self, handle): def get_citation_from_handle(self, handle):
""" """
@ -784,7 +784,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Citation exists, a HandleError is raised. If no such Citation exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Citation, self.citation_map) return self._get_from_handle(handle, Citation, self.citation_map)
def get_media_from_handle(self, handle): def get_media_from_handle(self, handle):
""" """
@ -792,7 +792,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Object exists, a HandleError is raised. If no such Object exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Media, self.media_map) return self._get_from_handle(handle, Media, self.media_map)
def get_place_from_handle(self, handle): def get_place_from_handle(self, handle):
""" """
@ -800,7 +800,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Place exists, a HandleError is raised. If no such Place exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Place, self.place_map) return self._get_from_handle(handle, Place, self.place_map)
def get_event_from_handle(self, handle): def get_event_from_handle(self, handle):
""" """
@ -808,7 +808,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Event exists, a HandleError is raised. If no such Event exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Event, self.event_map) return self._get_from_handle(handle, Event, self.event_map)
def get_family_from_handle(self, handle): def get_family_from_handle(self, handle):
""" """
@ -816,7 +816,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Family exists, a HandleError is raised. If no such Family exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Family, self.family_map) return self._get_from_handle(handle, Family, self.family_map)
def get_repository_from_handle(self, handle): def get_repository_from_handle(self, handle):
""" """
@ -824,7 +824,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Repository exists, a HandleError is raised. If no such Repository exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Repository, self.repository_map) return self._get_from_handle(handle, Repository, self.repository_map)
def get_note_from_handle(self, handle): def get_note_from_handle(self, handle):
""" """
@ -832,7 +832,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Note exists, a HandleError is raised. If no such Note exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Note, self.note_map) return self._get_from_handle(handle, Note, self.note_map)
def get_tag_from_handle(self, handle): def get_tag_from_handle(self, handle):
""" """
@ -840,7 +840,7 @@ class DbBsddbRead(DbReadBase, Callback):
If no such Tag exists, a HandleError is raised. If no such Tag exists, a HandleError is raised.
""" """
return self.get_from_handle(handle, Tag, self.tag_map) return self._get_from_handle(handle, Tag, self.tag_map)
def __get_obj_from_gramps_id(self, val, tbl, class_, prim_tbl): def __get_obj_from_gramps_id(self, val, tbl, class_, prim_tbl):
if isinstance(tbl, dict): if isinstance(tbl, dict):

1
gramps/plugins/database/bsddb_support/test/db_test.py
View File

@ -57,7 +57,6 @@ class DbTest(unittest.TestCase):
"get_family_from_handle", "get_family_from_handle",
"get_family_handles", "get_family_handles",
"get_family_relation_types", "get_family_relation_types",
"get_from_handle",
"get_gramps_ids", "get_gramps_ids",
"get_media_attribute_types", "get_media_attribute_types",
"get_media_bookmarks", "get_media_bookmarks",

9
gramps/plugins/database/dummydb.py
View File

@ -549,15 +549,6 @@ class DummyDb(M_A_M_B("NewBaseClass", (DbReadBase, Callback, object,), {})):
LOG.warn("database is closed") LOG.warn("database is closed")
return [] return []
def get_from_handle(self, handle, class_type, data_map):
"""
Return unserialized data from database given handle and object class
"""
if not self.db_is_open:
LOG.warn("database is closed")
LOG.warn("handle %s does not exist in the dummy database" % handle)
raise HandleError('Handle %s not found' % handle.decode('utf-8'))
def get_gramps_ids(self, obj_key): def get_gramps_ids(self, obj_key):
""" """
Returns all the keys from a table given a table name Returns all the keys from a table given a table name