[gnue] r7080 - in trunk/gnue-common/src/datasources: . drivers/DBSIG2 drivers/adodbapi/adodbapi drivers/dbf/dbf drivers/interbase/interbase drivers/postgresql/pygresql drivers/special/configfile drivers/special/static drivers/special/unbound

[reinhard]

Author: reinhard
Date: 2005-03-02 16:00:12 -0600 (Wed, 02 Mar 2005)
New Revision: 7080

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
   trunk/gnue-common/src/datasources/drivers/dbf/dbf/Connection.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
   trunk/gnue-common/src/datasources/drivers/special/configfile/DataObject.py
   trunk/gnue-common/src/datasources/drivers/special/static/Connection.py
   trunk/gnue-common/src/datasources/drivers/special/static/DataObject.py
   trunk/gnue-common/src/datasources/drivers/special/static/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/special/static/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/special/unbound/Driver.py
Log:
Removed a few references to obsoleted module GDataObjects.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-03-02 21:47:05 UTC 
(rev 7079)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-03-02 22:00:12 UTC 
(rev 7080)
@@ -25,7 +25,6 @@
 """
 
 from gnue.common.apps import i18n, errors
-from gnue.common.datasources import GDataObjects
 from gnue.common.definitions import GObjects
 import sys, string, types, cStringIO
 from gnue.common.datasources import GConnections

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2005-03-02 22:00:12 UTC (rev 7080)
@@ -168,7 +168,7 @@
       else:
         err = u_("Object of unknown type (%s) passed to DBSIG2 based 
dbdriver.") % type(value)
         # FIXME: raise an error instead of just printing a warning, after some 
transition time
-        #raise GDataObjects.UnknownDataType, err
+        #raise Exceptions.UnknownDataType, err
         gDebug (1, err)
         return "'%s'" % replace(str(value),
                                        "'",

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py   
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py   
2005-03-02 22:00:12 UTC (rev 7080)
@@ -34,7 +34,7 @@
 #### ATTRIBUTES, PLEASE UPDATE info.py ####
 ####                                   ####
 
-from gnue.common.datasources import GDataObjects, GConditions, GConnections
+from gnue.common.datasources import Exceptions, GConditions, GConnections
 from gnue.common.apps import GDebug
 from gnue.common.datasources.drivers import DBSIG2
 from DataObject import *
@@ -83,5 +83,5 @@
       self.native = SIG2api.connect(connStr)
 
     except self._DatabaseError, value:
-      raise GDataObjects.LoginError, value
+      raise Exceptions.LoginError, value
 

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2005-03-02 22:00:12 UTC (rev 7080)
@@ -29,7 +29,7 @@
 
 __all__ = ['DataObject_SQL','DataObject_Object']
 
-from gnue.common.datasources import GDataObjects, GConditions, GConnections
+from gnue.common.datasources import Exceptions, GConditions, GConnections
 from gnue.common.datasources.drivers import DBSIG2
 
 
@@ -56,7 +56,7 @@
         recordCount = self._getQueryCount(conditions,sql)
 
     except self._DatabaseError, err:
-      raise GDataObjects.ConnectionError, err
+      raise Exceptions.ConnectionError, err
 
     rs = self._resultSetClass(self, cursor=cursor, 
masterRecordSet=masterRecordSet)
     if self._strictQueryCount:

Modified: trunk/gnue-common/src/datasources/drivers/dbf/dbf/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/dbf/dbf/Connection.py     
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/dbf/dbf/Connection.py     
2005-03-02 22:00:12 UTC (rev 7080)
@@ -40,7 +40,7 @@
 
 from gnue.common.datasources.drivers import Base
 from DataObject import DBF_DataObject
-from gnue.common.datasources.GDataObjects import Error
+from gnue.common.datasources.Exceptions import Error
 #from gnue.common.datasources import GConnections
 
 try:

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2005-03-02 22:00:12 UTC (rev 7080)
@@ -44,7 +44,7 @@
 from string import upper, lower, rstrip
 import sys
 import types
-from gnue.common.datasources import GDataObjects, GConditions, GConnections
+from gnue.common.datasources import Exceptions, GConditions, GConnections
 from gnue.common.apps import errors, i18n
 from gnue.common.datasources.drivers import DBSIG2
 from DataObject import *
@@ -120,7 +120,7 @@
       self._beginTransaction ()
 
     except self._DatabaseError:
-      raise GDataObjects.LoginError, errors.getException () [2]
+      raise Exceptions.LoginError, errors.getException () [2]
 
 
   # ---------------------------------------------------------------------------

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2005-03-02 22:00:12 UTC (rev 7080)
@@ -32,7 +32,7 @@
 
 
 import sys
-from gnue.common.datasources import GDataObjects
+from gnue.common.datasources import Exceptions
 from gnue.common.apps import errors
 from gnue.common.datasources.drivers import DBSIG2
 from ResultSet import ResultSet
@@ -60,7 +60,7 @@
       cursor.arraysize = self.cache
 
     except self._DatabaseError:
-      raise GDataObjects.ConnectionError, errors.getException () [2]
+      raise Exceptions.ConnectionError, errors.getException () [2]
 
     # Our ResultSet class performs an implicit record-count in it's constructor
     # so we won't force another duplicate count

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py     
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py     
2005-03-02 22:00:12 UTC (rev 7080)
@@ -30,7 +30,7 @@
 
 __all__ = ('Connection')
 
-from gnue.common.datasources import GDataObjects, GConditions, GConnections
+from gnue.common.datasources import Exceptions, GConditions, GConnections
 from gnue.common.apps import GDebug
 
 try:
@@ -53,9 +53,9 @@
                    host=connectData['host'],
                    database=connectData['dbname'])
     except PGError, value:
-      raise GDataObjects.LoginError, value
+      raise Exceptions.LoginError, value
     except self._DatabaseError, value:
-      raise GDataObjects.LoginError, value
+      raise Exceptions.LoginError, value
 
     if connectData.has_key ('encoding'):
       encoding = connectData['encoding']

Modified: 
trunk/gnue-common/src/datasources/drivers/special/configfile/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/configfile/DataObject.py  
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/configfile/DataObject.py  
2005-03-02 22:00:12 UTC (rev 7080)
@@ -32,7 +32,8 @@
 from gnue.common.datasources.drivers.Base.DataObject import DataObject
 from ResultSet import Configfile_ResultSet
 from gnue.common.apps import GDebug
-from gnue.common.datasources import GDataObjects
+from gnue.common.datasources import Exceptions
+from gnue.common.datasources.drivers import Base
 from gnue import paths
 
 class Configfile_DataObject(DataObject):
@@ -80,7 +81,7 @@
     if conditions!=None:
       tmsg = _("This database driver always shows all sections\
              of a config file. You cannot execute querys on it.")
-      raise GDataObjects.ConnectionError, tmsg
+      raise Exceptions.ConnectionError, tmsg
     result=[]
     for section in self._dataConnection.sections():
       record={"_section_name":section}
@@ -114,10 +115,10 @@
 
   def getSchemaByName(self, name, type=None): 
       classdef = self._dataConnection.getFullClassDefinition(str(name))
-      schema = GDataObjects.Schema(attrs={'id':string.lower(classdef.name),
-                                          'name':classdef.name,
-                                          'type':'object'},
-                                   getChildSchema=self.__getFieldSchema)
+      schema = Base.Schema(attrs={'id':string.lower(classdef.name),
+                                  'name':classdef.name,
+                                  'type':'object'},
+                           getChildSchema=self.__getFieldSchema)
       return schema
   
   # Get fields/methods of a GEAS object

Modified: trunk/gnue-common/src/datasources/drivers/special/static/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/static/Connection.py      
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/static/Connection.py      
2005-03-02 22:00:12 UTC (rev 7080)
@@ -30,7 +30,7 @@
 __all__ = ['Connection']
 
 from gnue.common.apps import GConfig
-from gnue.common.datasources.GDataObjects import *
+from gnue.common.datasources.drivers import Base
 from DataObject import *
 
 ####                                   ####
@@ -38,7 +38,7 @@
 #### ATTRIBUTES, PLEASE UPDATE info.py ####
 ####                                   ####
 
-class Connection(Connection):
+class Connection(Base.Connection):
 
   # TODO: do we have/need Introspection?
   #defaultBehavior = Introspection

Modified: trunk/gnue-common/src/datasources/drivers/special/static/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/static/DataObject.py      
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/static/DataObject.py      
2005-03-02 22:00:12 UTC (rev 7080)
@@ -30,7 +30,7 @@
 
 __all__ = ['STATIC_DataObject']
 
-from gnue.common.datasources.GDataObjects import DataObject
+from gnue.common.datasources.drivers.Base import DataObject
 from ResultSet import STATIC_ResultSet
 
 class STATIC_DataObject (DataObject): 

Modified: trunk/gnue-common/src/datasources/drivers/special/static/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/static/RecordSet.py       
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/static/RecordSet.py       
2005-03-02 22:00:12 UTC (rev 7080)
@@ -31,10 +31,10 @@
 __all__ = ['STATIC_RecordSet']
 
 import string
-from gnue.common.datasources.GDataObjects import *
+from gnue.common.datasources.drivers import Base
 
 
-class STATIC_RecordSet (RecordSet): 
+class STATIC_RecordSet (Base.RecordSet): 
 
   def isPending(self):
     return 0
@@ -42,7 +42,3 @@
   # Post any changes to database
   def _postChanges(self, recordNumber=None): 
     return 1
-
-  
-
-

Modified: trunk/gnue-common/src/datasources/drivers/special/static/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/static/ResultSet.py       
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/static/ResultSet.py       
2005-03-02 22:00:12 UTC (rev 7080)
@@ -30,13 +30,13 @@
 
 __all__ = ["STATIC_ResultSet"]
 
-from gnue.common.datasources.GDataObjects import *
+from gnue.common.datasources.drivers import Base
 from RecordSet import STATIC_RecordSet
 
-class STATIC_ResultSet(ResultSet):
+class STATIC_ResultSet(Base.ResultSet):
 
   def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
-    ResultSet.__init__(self, dataObject, \
+    Base.ResultSet.__init__(self, dataObject, \
             cursor, defaultValues, masterRecordSet)
     
     self._recordSetClass = STATIC_RecordSet
@@ -77,5 +77,3 @@
   # Create an empty record
   def _createEmptyRecord(self, masterRecordSet=None): 
     return self._recordSetClass(self, None)
-
-

Modified: trunk/gnue-common/src/datasources/drivers/special/unbound/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/unbound/Driver.py 
2005-03-02 21:47:05 UTC (rev 7079)
+++ trunk/gnue-common/src/datasources/drivers/special/unbound/Driver.py 
2005-03-02 22:00:12 UTC (rev 7080)
@@ -29,7 +29,7 @@
 #
 
 import string
-from gnue.common.datasources.GDataObjects import * 
+from gnue.common.datasources.drivers.Base import *
 
 
 ###########################################################