2007-10-03 Don Allingham <don@gramps-project.org>

* various: create gen package, move proxy files to this library



svn: r9066

src/GrampsDb/Makefile.am

@@ -8,7 +8,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/GrampsDb
 pkgdata_PYTHON = \
 	_CursorIterator.py \
 	_DbUtils.py \
-	_DbBase.py \
 	_GrampsBSDDB.py\
 	_GrampsCursor.py\
 	_GrampsDbBase.py\

src/GrampsDb/_GrampsDbWriteXML.py

@@ -61,6 +61,8 @@ from _GrampsDbConst import \
 from _GrampsDbExceptions import *
 from _LongOpStatus import LongOpStatus
 
+import gen.proxy
+
 #-------------------------------------------------------------------------
 #
 # Attempt to load the GZIP library. Some version of python do not seem
@@ -105,16 +107,14 @@ def exportData(database, filename, person, option_box, callback, version="unknow
     private = option_box.private
 
     if private:
-        from GrampsDbUtils._PrivateProxyDb import PrivateProxyDb
-        database = PrivateProxyDb(database)
+        database = gen.proxy.PrivateProxyDb(database)
 
     if restrict:
-        from GrampsDbUtils._LivingProxyDb import LivingProxyDb
-        database = LivingProxyDb(database, LivingProxyDb.MODE_RESTRICT)
+        database = gen.proxy.LivingProxyDb(
+            database, gen.proxy.LivingProxyDb.MODE_RESTRICT)
 
     if not option_box.cfilter.is_empty():
-        from GrampsDbUtils._FilterProxyDb import FilterProxyDb
-        database = FilterProxyDb(database, option_box.cfilter)
+        database = gen.proxy.FilterProxyDb(database, option_box.cfilter)
 
     g = GrampsDbXmlWriter(database, 0, compress, version, callback)
     ret = g.write(filename)

src/GrampsDbUtils/Makefile.am

@@ -16,9 +16,6 @@ pkgdata_PYTHON = \
 	_GedcomUtils.py\
 	_GrampsDbWRFactories.py\
 	__init__.py\
-	_LivingProxyDb.py\
-	_PrivateProxyDb.py\
-	_ProxyDbBase.py\
 	_ReadGedcom.py\
 	_ReadXML.py\
 	_WriteGedcom.py\

src/GrampsDbUtils/_WriteGedcom.py

@@ -41,6 +41,7 @@ import _GedcomInfo as GedcomInfo
 import Errors
 import ExportOptions
 import BasicUtils
+import gen.proxy
 from QuestionDialog import ErrorDialog
 
 #-------------------------------------------------------------------------
@@ -290,20 +291,18 @@ class GedcomWriter(BasicUtils.UpdateCallback):
 
             # If the private flag is set, apply the PrivateProxyDb
             if option_box.private:
-                from _PrivateProxyDb import PrivateProxyDb
-                self.dbase = PrivateProxyDb(self.dbase)
+                self.dbase = gen.proxy.PrivateProxyDb(self.dbase)
 
             # If the restrict flag is set, apply the LivingProxyDb
             if option_box.restrict:
-                from _LivingProxyDb import LivingProxyDb
-                self.dbase = LivingProxyDb(self.dbase, 
-                                           LivingProxyDb.MODE_RESTRICT)
+                self.dbase = gen.proxy.LivingProxyDb(
+                    self.dbase, gen.proxy.LivingProxyDb.MODE_RESTRICT)
 
             # If the filter returned by cfilter is not empty, apply the 
             # FilterProxyDb
             if not option_box.cfilter.is_empty():
-                from _FilterProxyDb import FilterProxyDb
-                self.dbase = FilterProxyDb(self.dbase, option_box.cfilter)
+                self.dbase = gen.proxy.FilterProxyDb(
+                    self.dbase, option_box.cfilter)
 
     def write_gedcom_file(self, filename):
         """

src/GrampsDbUtils/__init__.py

@@ -35,6 +35,7 @@ on using these factories see the _GrampsDbUtilsFactories.py file comments.
 
 """
 
+__version__ = "$Revision$"
 
 from _GrampsDbWRFactories import \
      gramps_db_writer_factory, \
@@ -48,6 +49,6 @@ from _WriteXML import XmlWriter
 
 import _Backup as Backup
 
-from _PrivateProxyDb import PrivateProxyDb
-from _LivingProxyDb import LivingProxyDb
+#from _PrivateProxyDb import PrivateProxyDb
+#from _LivingProxyDb import LivingProxyDb
 

src/Makefile.am

@@ -9,6 +9,7 @@ SUBDIRS = \
 	Editors \
 	Filters \
 	FilterEditor \
+	gen \
 	GrampsDb \
 	GrampsDbUtils \
 	GrampsLocale \

src/gen/proxy/filterproxy.py

@@ -33,7 +33,7 @@ __revision__ = "$Revision: 8864 $"
 #
 #-------------------------------------------------------------------------
 from RelLib import *
-from _ProxyDbBase import ProxyDbBase
+from proxybase import ProxyDbBase
 
 class FilterProxyDb(ProxyDbBase):
     """

src/gen/proxy/livingproxy.py

@@ -32,7 +32,7 @@ __revision__ = "$Revision$"
 # GRAMPS libraries
 #
 #-------------------------------------------------------------------------
-from _ProxyDbBase import ProxyDbBase
+from proxybase import ProxyDbBase
 from RelLib import *
 from Utils import probably_alive
 

src/gen/proxy/privateproxy.py

@@ -33,7 +33,7 @@ __revision__ = "$Revision$"
 #
 #-------------------------------------------------------------------------
 from RelLib import *
-from _ProxyDbBase import ProxyDbBase
+from proxybase import ProxyDbBase
 
 class PrivateProxyDb(ProxyDbBase):
     """

src/gen/proxy/proxybase.py

@@ -32,7 +32,7 @@ __revision__ = "$Revision: 8864 $"
 # GRAMPS libraries
 #
 #-------------------------------------------------------------------------
-from GrampsDb import DbBase
+from dbbase import DbBase
 
 class ProxyDbBase(DbBase):
     """

src/plugins/NarrativeWeb.py

@@ -82,7 +82,8 @@ from QuestionDialog import ErrorDialog, WarningDialog
 from BasicUtils import name_displayer as _nd
 from DateHandler import displayer as _dd
 from DateHandler import parser as _dp
-from GrampsDbUtils import PrivateProxyDb, LivingProxyDb
+from gen.proxy import PrivateProxyDb
+from gen.proxy import LivingProxyDb
 
 #------------------------------------------------------------------------
 #

src/plugins/WritePkg.py

@@ -35,6 +35,7 @@ from cStringIO import StringIO
 from gettext import gettext as _
 import ExportOptions
 from BasicUtils import UpdateCallback
+import gen.proxy
 
 #------------------------------------------------------------------------
 #
@@ -76,16 +77,14 @@ def writeData(database, filename, person, option_box, callback=None):
     private = option_box.private
 
     if private:
-        from GrampsDbUtils._PrivateProxyDb import PrivateProxyDb
-        database = PrivateProxyDb(database)
+        database = gen.proxy.PrivateProxyDb(database)
 
     if restrict:
-        from GrampsDbUtils._LivingProxyDb import LivingProxyDb
-        database = LivingProxyDb(database, LivingProxyDb.MODE_RESTRICT)
+        database = gen.proxy.LivingProxyDb(
+            database, gen.proxy.LivingProxyDb.MODE_RESTRICT)
 
     if not option_box.cfilter.is_empty():
-        from GrampsDbUtils._FilterProxyDb import FilterProxyDb
-        database = FilterProxyDb(database, option_box.cfilter)
+        database = gen.proxy.FilterProxyDb(database, option_box.cfilter)
 
 
     writer = PackageWriter(database, filename, callback)