From dc8b47a2701c591d10a92d1f5c5a53a0177acf60 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 3 Oct 2007 17:14:26 +0000
Subject: [PATCH] 2007-10-03  Don Allingham  <don@gramps-project.org> 	*
 various: create gen package, move proxy files to this library

svn: r9066
---
 ChangeLog                                     |  3 +++
 configure.in                                  | 27 ++-----------------
 po/POTFILES.in                                | 10 ++++---
 src/GrampsDb/Makefile.am                      |  1 -
 src/GrampsDb/_GrampsDbWriteXML.py             | 12 ++++-----
 src/GrampsDbUtils/Makefile.am                 |  3 ---
 src/GrampsDbUtils/_WriteGedcom.py             | 13 +++++----
 src/GrampsDbUtils/__init__.py                 |  5 ++--
 src/Makefile.am                               |  1 +
 .../_DbBase.py => gen/proxy/dbbase.py}        |  0
 .../proxy/filterproxy.py}                     |  2 +-
 .../proxy/livingproxy.py}                     |  2 +-
 .../proxy/privateproxy.py}                    |  2 +-
 .../proxy/proxybase.py}                       |  2 +-
 src/plugins/NarrativeWeb.py                   |  3 ++-
 src/plugins/WritePkg.py                       | 11 ++++----
 16 files changed, 39 insertions(+), 58 deletions(-)
 rename src/{GrampsDb/_DbBase.py => gen/proxy/dbbase.py} (100%)
 rename src/{GrampsDbUtils/_FilterProxyDb.py => gen/proxy/filterproxy.py} (99%)
 rename src/{GrampsDbUtils/_LivingProxyDb.py => gen/proxy/livingproxy.py} (99%)
 rename src/{GrampsDbUtils/_PrivateProxyDb.py => gen/proxy/privateproxy.py} (99%)
 rename src/{GrampsDbUtils/_ProxyDbBase.py => gen/proxy/proxybase.py} (99%)

diff --git a/ChangeLog b/ChangeLog
index c7141ceb1..5d630b285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-03  Don Allingham  <don@gramps-project.org>
+	* various: create gen package, move proxy files to this library
+
 2007-10-03 Benny Malengier <benny.malengier@gramps-project.org> 
 	* src/DataViews/_PedigreeView.py: correctly load bookmarks, issue 1271
 	* src/DataViews/_RelationView.py: correctly load bookmarks, issue 1271
diff --git a/configure.in b/configure.in
index 64483915e..0ad49b808 100644
--- a/configure.in
+++ b/configure.in
@@ -113,31 +113,6 @@ then
 fi
 AC_MSG_RESULT($has_pygnome)
 
-AC_MSG_CHECKING(Python bindings for gnome vfs)
-cat > conftest.py <<EOF
-$pygtk_require
-try:
-    # Do not import gnome.vfs, this can raise a RuntimeError if the
-    # display cannot be opened.  Just search it.
-    import imp
-    imp.find_module('gnome/vfs')
-    out("gnome.vfs")
-except ImportError:
-    imp.find_module('gnomevfs')
-    out("gnomevfs")
-except:
-    out("NO")
-EOF
-$PYTHON conftest.py
-has_vfs=`cat conftest.out`
-rm -f conftest.out conftest.py
-if test NO = "$has_vfs"
-then
-   AC_MSG_ERROR([
-**** The python bindings for GNOME VFS (gnome2-python-vfs) could not be found.])
-fi
-AC_MSG_RESULT($has_vfs)
-
 AC_MSG_CHECKING(Python bindings for glade)
 cat > conftest.py <<EOF
 $pygtk_require
@@ -202,6 +177,8 @@ src/PluginUtils/Makefile
 src/ReportBase/Makefile
 src/plugins/Makefile
 src/DateHandler/Makefile
+src/gen/Makefile
+src/gen/proxy/Makefile
 src/data/Makefile
 src/data/templates/Makefile
 src/glade/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a017ff99..fb0611da7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -213,9 +213,6 @@ src/GrampsDbUtils/_GedcomStageOne.py
 src/GrampsDbUtils/_GedcomParse.py
 src/GrampsDbUtils/_GedcomTokens.py
 src/GrampsDbUtils/_GrampsDbWRFactories.py
-src/GrampsDbUtils/_LivingProxyDb.py
-src/GrampsDbUtils/_PrivateProxyDb.py
-src/GrampsDbUtils/_ProxyDbBase.py
 src/GrampsDbUtils/_ReadGedcom.py
 src/GrampsDbUtils/_ReadXML.py
 src/GrampsDbUtils/_WriteGedcom.py
@@ -223,6 +220,13 @@ src/GrampsDbUtils/_WriteGrdb.py
 src/GrampsDbUtils/_WriteXML.py
 src/GrampsDbUtils/__init__.py
 
+# gen/proxy
+src/gen/proxy/livingproxy.py
+src/gen/proxy/privateproxy.py
+src/gen/proxy/proxybase.py
+src/gen/proxy/dbbase.py
+src/gen/proxy/__init__.py
+
 # GrampsLocale package
 src/GrampsLocale/_GrampsLocale.py
 
diff --git a/src/GrampsDb/Makefile.am b/src/GrampsDb/Makefile.am
index 84371c102..45ef71d68 100644
--- a/src/GrampsDb/Makefile.am
+++ b/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\
diff --git a/src/GrampsDb/_GrampsDbWriteXML.py b/src/GrampsDb/_GrampsDbWriteXML.py
index ced284eb8..4539977c1 100644
--- a/src/GrampsDb/_GrampsDbWriteXML.py
+++ b/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)
diff --git a/src/GrampsDbUtils/Makefile.am b/src/GrampsDbUtils/Makefile.am
index bed94eed7..ae8995406 100644
--- a/src/GrampsDbUtils/Makefile.am
+++ b/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\
diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py
index 71ec8c0e7..d9a3eb5de 100644
--- a/src/GrampsDbUtils/_WriteGedcom.py
+++ b/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):
         """
diff --git a/src/GrampsDbUtils/__init__.py b/src/GrampsDbUtils/__init__.py
index 4b3ba86be..3c74a4cb7 100644
--- a/src/GrampsDbUtils/__init__.py
+++ b/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
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fdb6fc59e..1b0ce6a89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = \
 	Editors \
 	Filters \
 	FilterEditor \
+	gen \
 	GrampsDb \
 	GrampsDbUtils \
 	GrampsLocale \
diff --git a/src/GrampsDb/_DbBase.py b/src/gen/proxy/dbbase.py
similarity index 100%
rename from src/GrampsDb/_DbBase.py
rename to src/gen/proxy/dbbase.py
diff --git a/src/GrampsDbUtils/_FilterProxyDb.py b/src/gen/proxy/filterproxy.py
similarity index 99%
rename from src/GrampsDbUtils/_FilterProxyDb.py
rename to src/gen/proxy/filterproxy.py
index a60502fe6..52fad5a5a 100644
--- a/src/GrampsDbUtils/_FilterProxyDb.py
+++ b/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):
     """
diff --git a/src/GrampsDbUtils/_LivingProxyDb.py b/src/gen/proxy/livingproxy.py
similarity index 99%
rename from src/GrampsDbUtils/_LivingProxyDb.py
rename to src/gen/proxy/livingproxy.py
index ce43fde66..5a38db7f5 100644
--- a/src/GrampsDbUtils/_LivingProxyDb.py
+++ b/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
 
diff --git a/src/GrampsDbUtils/_PrivateProxyDb.py b/src/gen/proxy/privateproxy.py
similarity index 99%
rename from src/GrampsDbUtils/_PrivateProxyDb.py
rename to src/gen/proxy/privateproxy.py
index 176f1c731..97bc34494 100644
--- a/src/GrampsDbUtils/_PrivateProxyDb.py
+++ b/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):
     """
diff --git a/src/GrampsDbUtils/_ProxyDbBase.py b/src/gen/proxy/proxybase.py
similarity index 99%
rename from src/GrampsDbUtils/_ProxyDbBase.py
rename to src/gen/proxy/proxybase.py
index 1884d6ee9..f30dabaa5 100644
--- a/src/GrampsDbUtils/_ProxyDbBase.py
+++ b/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):
     """
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index aa068b0ba..1bcb418e2 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/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
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py
index d98f0c88b..fff4b75a4 100644
--- a/src/plugins/WritePkg.py
+++ b/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)