[gnue] r7472 - in trunk: gnue-common/src/datasources gnue-dbtools/src/loader/objects gnue-dbtools/src/sql gnue-integrator/src gnue-navigator/src gnue-reports/src/base

[reinhard]

Author: reinhard
Date: 2005-04-23 07:26:25 -0500 (Sat, 23 Apr 2005)
New Revision: 7472

Removed:
   trunk/gnue-common/src/datasources/GDataObjects.py
Modified:
   trunk/gnue-dbtools/src/loader/objects/field.py
   trunk/gnue-dbtools/src/loader/objects/load.py
   trunk/gnue-dbtools/src/sql/Client.py
   trunk/gnue-integrator/src/GIClient.py
   trunk/gnue-navigator/src/GNClient.py
   trunk/gnue-navigator/src/UIwin32.py
   trunk/gnue-navigator/src/UIwx.py
   trunk/gnue-reports/src/base/GRDataMapper.py
   trunk/gnue-reports/src/base/GRSources.py
Log:
Bye bye GDataObjects (finally!)


Deleted: trunk/gnue-common/src/datasources/GDataObjects.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataObjects.py   2005-04-23 12:07:29 UTC 
(rev 7471)
+++ trunk/gnue-common/src/datasources/GDataObjects.py   2005-04-23 12:26:25 UTC 
(rev 7472)
@@ -1,34 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise 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, or (at your option) any later version.
-#
-# GNU Enterprise 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 program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# GDataObjects.py
-#
-# DESCRIPTION:
-# This is a temporary backwards compatability file.
-# Should be removed at some point.
-#
-# NOTES:
-#
-
-from Exceptions import *
-from drivers.Base import *
-
-print "Warning: Accessing obsolete module 'GDataObjects'"

Modified: trunk/gnue-dbtools/src/loader/objects/field.py
===================================================================
--- trunk/gnue-dbtools/src/loader/objects/field.py      2005-04-23 12:07:29 UTC 
(rev 7471)
+++ trunk/gnue-dbtools/src/loader/objects/field.py      2005-04-23 12:26:25 UTC 
(rev 7472)
@@ -33,7 +33,6 @@
 
 from gnue.common.apps import GDebug
 from gnue.common import events
-from gnue.common.datasources.GDataObjects import ConnectionError as DBError
 from gnue.common.definitions.GRootObj import GRootObj
 from gnue.common.logic.GTrigger import TriggerError
 from gnue.common.definitions.GObjects import GObj
@@ -50,4 +49,3 @@
 
     # Runtime Variables
     self._type = 'field'
-       

Modified: trunk/gnue-dbtools/src/loader/objects/load.py
===================================================================
--- trunk/gnue-dbtools/src/loader/objects/load.py       2005-04-23 12:07:29 UTC 
(rev 7471)
+++ trunk/gnue-dbtools/src/loader/objects/load.py       2005-04-23 12:26:25 UTC 
(rev 7472)
@@ -33,7 +33,6 @@
 
 from gnue.common.apps import GDebug
 from gnue.common import events
-from gnue.common.datasources.GDataObjects import ConnectionError as DBError
 from gnue.common.definitions.GRootObj import GRootObj
 from gnue.common.logic.GTrigger import TriggerError
 from gnue.common.definitions.GObjects import GObj
@@ -51,7 +50,3 @@
     
     # Runtime Variables
     self._type = 'load'
-
-
-                                                                    
-                                                                    

Modified: trunk/gnue-dbtools/src/sql/Client.py
===================================================================
--- trunk/gnue-dbtools/src/sql/Client.py        2005-04-23 12:07:29 UTC (rev 
7471)
+++ trunk/gnue-dbtools/src/sql/Client.py        2005-04-23 12:26:25 UTC (rev 
7472)
@@ -32,7 +32,6 @@
 from gnue.common.apps.GClientApp import *
 from gnue.common.apps import GDebug
 from gnue.common.apps import GConfig
-from gnue.common.datasources import GDataObjects, GConnections
 from gnue.common import events
 
 from gnue.dbtools import VERSION

Modified: trunk/gnue-integrator/src/GIClient.py
===================================================================
--- trunk/gnue-integrator/src/GIClient.py       2005-04-23 12:07:29 UTC (rev 
7471)
+++ trunk/gnue-integrator/src/GIClient.py       2005-04-23 12:26:25 UTC (rev 
7472)
@@ -33,7 +33,6 @@
 from GIParser import loadMapping
 from gnue.common.apps import GDebug
 from gnue.common.utils.FileUtils import openResource
-from gnue.common.datasources import GDataObjects, GConnections
 from gnue.common.apps.GClientApp import *
 from gnue.integrator import VERSION
 

Modified: trunk/gnue-navigator/src/GNClient.py
===================================================================
--- trunk/gnue-navigator/src/GNClient.py        2005-04-23 12:07:29 UTC (rev 
7471)
+++ trunk/gnue-navigator/src/GNClient.py        2005-04-23 12:26:25 UTC (rev 
7472)
@@ -30,7 +30,6 @@
 from gnue.navigator import Actions
 from gnue.common.apps import errors
 from gnue.common.utils.FileUtils import openResource, dyn_import
-from gnue.common.datasources import GDataObjects, GConnections
 from gnue.common.apps.GClientApp import *
 from gnue import paths
 from gnue.navigator import VERSION

Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2005-04-23 12:07:29 UTC (rev 7471)
+++ trunk/gnue-navigator/src/UIwin32.py 2005-04-23 12:26:25 UTC (rev 7472)
@@ -30,7 +30,7 @@
 
 
 import os, sys
-from gnue.common.datasources import GDataObjects, GConnections
+from gnue.common.datasources import Exceptions, GConnections
 from gnue.common.utils.FileUtils import dyn_import, openResource
 from gnue.common.apps import GConfig
 from gnue.navigator import VERSION
@@ -337,15 +337,15 @@
     except IOError, mesg:
       self.handleError(_("Unable to open file\n\n     %s")%mesg)
 
-    except GDataObjects.ConnectError, mesg:
+    except Exceptions.ConnectError, mesg:
       self.handleError(\
          _("Unable to login to datasource.\n\n       %s") %mesg)
 
-    except GDataObjects.ConnectionError, mesg:
+    except Exceptions.ConnectionError, mesg:
       self.handleError(\
          _("Error while communicating with datasource.\n\n       %s") %mesg)
 
-    except GDataObjects.Error, mesg:
+    except Exceptions.Error, mesg:
       self.handleError(mesg)
 
 

Modified: trunk/gnue-navigator/src/UIwx.py
===================================================================
--- trunk/gnue-navigator/src/UIwx.py    2005-04-23 12:07:29 UTC (rev 7471)
+++ trunk/gnue-navigator/src/UIwx.py    2005-04-23 12:26:25 UTC (rev 7472)
@@ -33,7 +33,7 @@
 from wxPython.html import *
 from time import sleep
 import os, sys, string
-from gnue.common.datasources import GDataObjects, GConnections
+from gnue.common.datasources import Exceptions, GConnections
 from gnue.common.utils.FileUtils import dyn_import, openResource
 from gnue.common.apps import GConfig
 from gnue.navigator import VERSION
@@ -293,15 +293,15 @@
     except IOError, mesg:
       self.handleError(_("Unable to open file\n\n     %s")%mesg)
 
-    except GDataObjects.ConnectError, mesg:
+    except Exceptions.ConnectError, mesg:
       self.handleError(\
          _("Unable to login to datasource.\n\n       %s") %mesg)
 
-    except GDataObjects.ConnectionError, mesg:
+    except Exceptions.ConnectionError, mesg:
       self.handleError(\
          _("Error while communicating with datasource.\n\n       %s") %mesg)
 
-    except GDataObjects.Error, mesg:
+    except Exceptions.Error, mesg:
       self.handleError(mesg)
 
   def setTitle(self, title):

Modified: trunk/gnue-reports/src/base/GRDataMapper.py
===================================================================
--- trunk/gnue-reports/src/base/GRDataMapper.py 2005-04-23 12:07:29 UTC (rev 
7471)
+++ trunk/gnue-reports/src/base/GRDataMapper.py 2005-04-23 12:26:25 UTC (rev 
7472)
@@ -185,7 +185,7 @@
 
 
   #  Used in GRSources.__connectMasterDetail to link detail datasource to
-  #  master source.  Called by GDataObjects.ResultSet when master changed
+  #  master source.  Called by the ResultSet when master changed
   #  This will actually be over-written by GRDataMapper but at the time
   #  the master-detail must be linked, the GRDataMapper will not have been
   #  created yet.  [Yes, it's fugly]

Modified: trunk/gnue-reports/src/base/GRSources.py
===================================================================
--- trunk/gnue-reports/src/base/GRSources.py    2005-04-23 12:07:29 UTC (rev 
7471)
+++ trunk/gnue-reports/src/base/GRSources.py    2005-04-23 12:26:25 UTC (rev 
7472)
@@ -73,7 +73,7 @@
     self.master = None
 
   #  Used in GRSources.__connectMasterDetail to link detail datasource to
-  #  master source.  Called by GDataObjects.ResultSet when master changed
+  #  master source.  Called by the ResultSet when master changed
   #  This will actually be over-written by GRDataMapper but at the time
   #  the master-detail must be linked, the GRDataMapper will not have been
   #  created yet. [Yes, it's fugly]