From e64fa6555218d9d567d1ac511666c9d1abdaccaa Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 8 Jan 2016 22:58:18 +0000 Subject: [PATCH] Remove redundant objects These were needed for database upgrades but are no longer referenced anywhere. --- gramps/gen/lib/__init__.py | 1 - gramps/gen/lib/privsrcnote.py | 37 ----------------------------------- gramps/gen/lib/srcnote.py | 34 -------------------------------- gramps/gen/lib/witness.py | 33 ------------------------------- po/POTFILES.skip | 3 --- 5 files changed, 108 deletions(-) delete mode 100644 gramps/gen/lib/privsrcnote.py delete mode 100644 gramps/gen/lib/srcnote.py delete mode 100644 gramps/gen/lib/witness.py diff --git a/gramps/gen/lib/__init__.py b/gramps/gen/lib/__init__.py index 09345ab26..ac1bd5317 100644 --- a/gramps/gen/lib/__init__.py +++ b/gramps/gen/lib/__init__.py @@ -39,7 +39,6 @@ from .placeref import PlaceRef from .reporef import RepoRef from .surname import Surname from .url import Url -from .witness import Witness from .childref import ChildRef # Primary objects diff --git a/gramps/gen/lib/privsrcnote.py b/gramps/gen/lib/privsrcnote.py deleted file mode 100644 index 67d07a2bc..000000000 --- a/gramps/gen/lib/privsrcnote.py +++ /dev/null @@ -1,37 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2000-2006 Donald N. Allingham -# -# 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. -# - -""" -PrivateSourceNote class for GRAMPS. -""" - -from .srcnote import SourceNote -from .privacybase import PrivacyBase - -#------------------------------------------------------------------------- -# -# PrivateSourceNote class -# -#------------------------------------------------------------------------- -class PrivateSourceNote(SourceNote, PrivacyBase): - - def __init__(self): - SourceNote.__init__(self) - PrivacyBase.__init__(self) diff --git a/gramps/gen/lib/srcnote.py b/gramps/gen/lib/srcnote.py deleted file mode 100644 index 20348d4ee..000000000 --- a/gramps/gen/lib/srcnote.py +++ /dev/null @@ -1,34 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2000-2006 Donald N. Allingham -# -# 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. -# - -""" -SourceNote class for GRAMPS. -""" - -#------------------------------------------------------------------------- -# -# SourceNote classes -# -#------------------------------------------------------------------------- -class SourceNote(object): - """This class is only present to enable db upgrade.""" - - def __init__(self): - pass diff --git a/gramps/gen/lib/witness.py b/gramps/gen/lib/witness.py deleted file mode 100644 index 5c9aebf5b..000000000 --- a/gramps/gen/lib/witness.py +++ /dev/null @@ -1,33 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2000-2005 Donald N. Allingham -# -# 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. -# - -""" -Witness class for GRAMPS. -""" - -#------------------------------------------------------------------------- -# -# Witness class -# -#------------------------------------------------------------------------- -class Witness(object): - """This class is only present to enable db upgrade.""" - def __init__(self): - pass diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 09c131a78..41c2649e2 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -148,7 +148,6 @@ gramps/gen/lib/place.py gramps/gen/lib/placebase.py gramps/gen/lib/primaryobj.py gramps/gen/lib/privacybase.py -gramps/gen/lib/privsrcnote.py gramps/gen/lib/refbase.py gramps/gen/lib/repo.py gramps/gen/lib/reporef.py @@ -156,7 +155,6 @@ gramps/gen/lib/researcher.py gramps/gen/lib/secondaryobj.py gramps/gen/lib/src.py gramps/gen/lib/srcbase.py -gramps/gen/lib/srcnote.py gramps/gen/lib/srcref.py gramps/gen/lib/styledtext.py gramps/gen/lib/styledtexttag.py @@ -169,7 +167,6 @@ gramps/gen/lib/test/grampstype_test.py gramps/gen/lib/test/merge_test.py gramps/gen/lib/url.py gramps/gen/lib/urlbase.py -gramps/gen/lib/witness.py # # gen.merge package #