From 4838650df49412826b3bee5ebb308edd0a89e266 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Tue, 29 Dec 2009 19:20:16 +0000 Subject: [PATCH] Move _GedcomParse.py to src/plugins/lib/libgedcom.py. Remove GrampsDbUtils. svn: r13940 --- po/POTFILES.in | 5 +--- src/GrampsDbUtils/Makefile.am | 25 ----------------- src/GrampsDbUtils/__init__.py | 28 ------------------- src/Makefile.am | 1 - src/plugins/export/ExportGedcom.py | 2 +- src/plugins/import/ImportGedcom.py | 8 +++--- src/plugins/lib/Makefile.am | 3 +- .../lib/libgedcom.py} | 0 src/plugins/lib/libplugins.gpr.py | 16 +++++++++++ src/plugins/tool/PHPGedViewConnector.py | 5 ++-- 10 files changed, 27 insertions(+), 66 deletions(-) delete mode 100644 src/GrampsDbUtils/Makefile.am delete mode 100644 src/GrampsDbUtils/__init__.py rename src/{GrampsDbUtils/_GedcomParse.py => plugins/lib/libgedcom.py} (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 7e5b0899f..c1666d1f6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -341,10 +341,6 @@ src/docgen/OpenSpreadSheet.py src/docgen/SpreadSheetDoc.py src/docgen/TextBufDoc.py -# GrampsDbUtils package -src/GrampsDbUtils/_GedcomParse.py -src/GrampsDbUtils/__init__.py - # GrampsLocale package src/GrampsLocale/_GrampsLocale.py @@ -439,6 +435,7 @@ src/plugins/import/ImportXml.py # plugins/lib directory src/plugins/lib/libcairodoc.py src/plugins/lib/libformatting.py +src/plugins/lib/libgedcom.py src/plugins/lib/libgrampsxml.py src/plugins/lib/libgrdb.py src/plugins/lib/libholiday.py diff --git a/src/GrampsDbUtils/Makefile.am b/src/GrampsDbUtils/Makefile.am deleted file mode 100644 index 51df9491a..000000000 --- a/src/GrampsDbUtils/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# This is the src/GrampsDbUtils level Makefile for Gramps -# We could use GNU make's ':=' syntax for nice wildcard use, -# but that is not necessarily portable. -# If not using GNU make, then list all .py files individually - -pkgdatadir = $(datadir)/@PACKAGE@/GrampsDbUtils - -pkgdata_PYTHON = \ - _GedcomParse.py\ - __init__.py - -pkgpyexecdir = @pkgpyexecdir@/GrampsDbUtils -pkgpythondir = @pkgpythondir@/GrampsDbUtils - -# Clean up all the byte-compiled files -MOSTLYCLEANFILES = *pyc *pyo - -GRAMPS_PY_MODPATH = "../" - -pycheck: - (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); - -pylint: - (export PYTHONPATH=..:.; pylint --rcfile=pylintrc _GedcomParse.py) diff --git a/src/GrampsDbUtils/__init__.py b/src/GrampsDbUtils/__init__.py deleted file mode 100644 index b5315614b..000000000 --- a/src/GrampsDbUtils/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2004-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -# $Id$ - -""" -This package implements additions to the the GrampsDb database. -""" - -from _GedcomParse import GedcomParser - diff --git a/src/Makefile.am b/src/Makefile.am index 774f0442b..7015fc978 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS = \ FilterEditor \ gen \ glade \ - GrampsDbUtils \ GrampsLocale \ GrampsLogger \ gui \ diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index 8537158de..67f8b2ab4 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -41,7 +41,7 @@ import time import gen.lib from gen.lib.date import make_gedcom_date, MONTH import const -import GrampsDbUtils._GedcomParse as libgedcom +import libgedcom import Errors from ExportOptions import WriterOptionBox import BasicUtils diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index 5a47b3019..22f2357f8 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -43,10 +43,10 @@ LOG = logging.getLogger(".GedcomImport") # #------------------------------------------------------------------------ import Errors -from GrampsDbUtils._GedcomParse import GedcomParser, GedcomStageOne from QuestionDialog import ErrorDialog, DBErrorDialog from glade import Glade from libmixin import DbMixin +import libgedcom try: import config @@ -102,14 +102,14 @@ def importData(database, filename, callback=None): try: ifile = open(filename, "rU") - stage_one = GedcomStageOne(ifile) + stage_one = libgedcom.GedcomStageOne(ifile) stage_one.parse() if code_set: stage_one.set_encoding(code_set) ifile.seek(0) - gedparse = GedcomParser(database, ifile, filename, callback, - stage_one, DEFAULT_SOURCE) + gedparse = libgedcom.GedcomParser(database, ifile, filename, callback, + stage_one, DEFAULT_SOURCE) except IOError, msg: ErrorDialog(_("%s could not be opened\n") % filename, str(msg)) return diff --git a/src/plugins/lib/Makefile.am b/src/plugins/lib/Makefile.am index 96cffe5d2..27e53262e 100644 --- a/src/plugins/lib/Makefile.am +++ b/src/plugins/lib/Makefile.am @@ -7,7 +7,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib pkgdata_PYTHON = \ libcairodoc.py\ - libformatting.py \ + libformatting.py\ + libgedcom.py\ libgrampsxml.py\ libgrdb.py\ libhtml.py\ diff --git a/src/GrampsDbUtils/_GedcomParse.py b/src/plugins/lib/libgedcom.py similarity index 100% rename from src/GrampsDbUtils/_GedcomParse.py rename to src/plugins/lib/libgedcom.py diff --git a/src/plugins/lib/libplugins.gpr.py b/src/plugins/lib/libplugins.gpr.py index 7fa75428b..70e588e3f 100644 --- a/src/plugins/lib/libplugins.gpr.py +++ b/src/plugins/lib/libplugins.gpr.py @@ -56,6 +56,22 @@ authors_email = ["http://gramps-project.org"], #load_on_reg = True ) +#------------------------------------------------------------------------ +# +# libgedcom +# +#------------------------------------------------------------------------ +register(GENERAL, +id = 'libgedcom', +name = "GEDCOM library", +description = _("Provides GEDCOM processing functionality"), +version = '1.0', +status = STABLE, +fname = 'libgedcom.py', +authors = ["The Gramps project"], +authors_email = ["http://gramps-project.org"], + ) + #------------------------------------------------------------------------ # # libgrampsxml diff --git a/src/plugins/tool/PHPGedViewConnector.py b/src/plugins/tool/PHPGedViewConnector.py index 590e690cc..fd9ea490d 100644 --- a/src/plugins/tool/PHPGedViewConnector.py +++ b/src/plugins/tool/PHPGedViewConnector.py @@ -30,6 +30,8 @@ import os from tempfile import mkstemp from gettext import gettext as _ from glade import Glade +import libgedcom + # # Interface to phpGedView # @@ -315,7 +317,6 @@ class phpGedViewImporter(object): gtk.main_iteration() def on_next_pressed_cb(self, widget, event=None, data=None): - from GrampsDbUtils import GedcomParser if event: print event.type @@ -334,7 +335,7 @@ class phpGedViewImporter(object): self.update_progressbar( _("Importing GEDCOM...")) - GedcomParser.importData(self.db, fn) + libgedcom.GedcomParser.importData(self.db, fn) # done. bye. self.dialog.destroy()