diff --git a/gramps/gen/lib/citationbase.py b/gramps/gen/lib/citationbase.py index 7521ba5ac..1d0767ae7 100644 --- a/gramps/gen/lib/citationbase.py +++ b/gramps/gen/lib/citationbase.py @@ -31,13 +31,6 @@ CitationBase class for Gramps. #------------------------------------------------------------------------- import logging -#------------------------------------------------------------------------- -# -# Gramps modules -# -#------------------------------------------------------------------------- -from .handle import Handle - LOG = logging.getLogger(".citation") #------------------------------------------------------------------------- diff --git a/gramps/gen/lib/handle.py b/gramps/gen/lib/handle.py deleted file mode 100644 index e2fbdcb50..000000000 --- a/gramps/gen/lib/handle.py +++ /dev/null @@ -1,55 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2013 Doug Blank -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -class HandleClass(str): - def __init__(self, handle): - super(HandleClass, self).__init__() - - def join(self, database, handle): - return database.get_table_func(self.classname,"handle_func")(handle) - - @classmethod - def get_schema(cls): - from . import (Person, Family, Event, Place, Source, Media, Repository, - Note, Citation, Tag) - tables = { - "Person": Person, - "Family": Family, - "Event": Event, - "Place": Place, - "Source": Source, - "Media": Media, - "Repository": Repository, - "Note": Note, - "Citation": Citation, - "Tag": Tag, - } - return tables[cls.classname].get_schema() - -def Handle(_classname, handle): - if handle is None: - return None - class MyHandleClass(HandleClass): - """ - Class created to have classname attribute. - """ - classname = _classname - h = MyHandleClass(handle) - return h diff --git a/gramps/gen/lib/notebase.py b/gramps/gen/lib/notebase.py index 6d20224a1..6bfb51de7 100644 --- a/gramps/gen/lib/notebase.py +++ b/gramps/gen/lib/notebase.py @@ -23,8 +23,6 @@ NoteBase class for Gramps. """ -from .handle import Handle - #------------------------------------------------------------------------- # # NoteBase class diff --git a/gramps/gen/lib/tagbase.py b/gramps/gen/lib/tagbase.py index 05f85c2c2..693467325 100644 --- a/gramps/gen/lib/tagbase.py +++ b/gramps/gen/lib/tagbase.py @@ -22,8 +22,6 @@ TagBase class for Gramps. """ -from .handle import Handle - #------------------------------------------------------------------------- # # TagBase class diff --git a/gramps/gen/simple/_simpleaccess.py b/gramps/gen/simple/_simpleaccess.py index 836a43809..4eb31b33f 100644 --- a/gramps/gen/simple/_simpleaccess.py +++ b/gramps/gen/simple/_simpleaccess.py @@ -25,7 +25,6 @@ Provide a simplified database access interface to the Gramps database. """ from ..lib import (Person, Family, Event, Source, Place, Citation, Media, Repository, Note, Date, Tag) -from ..lib.handle import Handle from ..datehandler import displayer from ..utils.string import gender as gender_map from ..utils.db import get_birth_or_fallback, get_death_or_fallback @@ -1009,8 +1008,6 @@ class SimpleAccess: return "Error: incorrect object class in display: '%s'" % type(obj) else: return "Error: missing object" - elif object_class == "Handle": - return "%s.handle [%s]" % (prop, value) else: return "Error: invalid object class in display: '%s'" % object_class @@ -1051,8 +1048,6 @@ class SimpleAccess: self.gid(obj)) elif isinstance(obj, Tag): return "[%s]" % (obj.name) - elif isinstance(obj, Handle): - return "%s.handle [%s]" % (prop, obj.handle) else: return "Error: incorrect object class in describe: '%s'" % type(obj)