commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue-common/src datasources/drivers/gadfly/gadf...


From: Jason Cater
Subject: gnue-common/src datasources/drivers/gadfly/gadf...
Date: Tue, 25 Nov 2003 12:21:38 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Jason Cater <address@hidden>    03/11/25 12:21:37

Modified files:
        src/datasources/drivers/gadfly/gadfly: DataObject.py 
                                               RecordSet.py ResultSet.py 
        src/datasources/drivers/informix/informix: DataObject.py 
                                                   RecordSet.py 
                                                   ResultSet.py 
        src/datasources/drivers/ingres/ingres: DataObject.py 
                                               RecordSet.py ResultSet.py 
        src/datasources/drivers/mysql/mysql: ResultSet.py 
        src/datasources/drivers/oracle/Base: DataObject.py 
        src/datasources/drivers/oracle/cxoracle: Driver.py 
        src/datasources/drivers/oracle/dcoracle: Driver.py 
        src/datasources/drivers/sapdb/sapdb: DataObject.py RecordSet.py 
                                             ResultSet.py 
        src/datasources/drivers/sqlite/sqlite: DataObject.py 
                                               RecordSet.py ResultSet.py 
        src/datasources/drivers/sqlrelay/sqlrelay: DataObject.py 
                                                   RecordSet.py 
                                                   ResultSet.py 
        src/datasources/drivers/sybase/sybase: Connection.py 
                                               DataObject.py 
                                               RecordSet.py ResultSet.py 
        src/rpc/drivers/soap/soappy: Driver.py 

Log message:
        fixed miscellaneous syntax errors

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/informix/informix/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/informix/informix/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/informix/informix/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/oracle/Base/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sybase/sybase/Connection.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/rpc/drivers/soap/soappy/Driver.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py:1.2 
gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py:1.2 Tue Nov 
25 12:01:33 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py     Tue Nov 
25 12:21:33 2003
***************
*** 33,57 ****
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try: 
!   import gadfly
! except ImportError, mesg:
!   GDebug.printMesg(1,mesg)
!   print "-"*79
!   print _("\nCould not load gadfly.  For Gadfly support, please install \n") \
!       + _("GadflyB5 1.0.0 pr1 or later from") \
!       + "http://gadfly.sourceforge.net\n";
!   print _("Error:  %s") % mesg
!   print "-"*79
!   sys.exit()
  
  
  
! class Gadfly_RecordSet(DBSIG2.RecordSet): 
    pass
  
  
--- 33,47 ----
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers import DBSIG2
  
! raise "This data driver has not been upgraded to the new format."
  
  
+ import gadfly
  
! 
! class Gadfly_RecordSet(DBSIG2.RecordSet):
    pass
  
  
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py:1.2  Tue Nov 
25 12:01:34 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py      Tue Nov 
25 12:21:34 2003
***************
*** 33,55 ****
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
! 
! try: 
!   import gadfly
! except ImportError, mesg:
!   GDebug.printMesg(1,mesg)
!   print "-"*79
!   print _("\nCould not load gadfly.  For Gadfly support, please install \n") \
!       + _("GadflyB5 1.0.0 pr1 or later from") \
!       + "http://gadfly.sourceforge.net\n";
!   print _("Error:  %s") % mesg
!   print "-"*79
!   sys.exit()
  
  
  
  class Gadfly_RecordSet(DBSIG2.RecordSet): 
    pass
--- 33,43 ----
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers import DBSIG2
  
+ import gadfly
  
+ raise "This data driver has not been upgraded to the new format."
  
  class Gadfly_RecordSet(DBSIG2.RecordSet): 
    pass
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py:1.2  Tue Nov 
25 12:01:34 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py      Tue Nov 
25 12:21:34 2003
***************
*** 33,61 ****
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
! 
! try: 
!   import gadfly
! except ImportError, mesg:
!   GDebug.printMesg(1,mesg)
!   print "-"*79
!   print _("\nCould not load gadfly.  For Gadfly support, please install \n") \
!       + _("GadflyB5 1.0.0 pr1 or later from") \
!       + "http://gadfly.sourceforge.net\n";
!   print _("Error:  %s") % mesg
!   print "-"*79
!   sys.exit()
  
  
  
! class Gadfly_RecordSet(DBSIG2.RecordSet): 
    pass
  
  
! class Gadfly_ResultSet(DBSIG2.ResultSet): 
    def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      cursor.rowcount=0
      DBSIG2.ResultSet.__init__(self, dataObject, \
--- 33,51 ----
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers import DBSIG2
  
+ import gadfly
  
  
! raise "This data driver has not been upgraded to the new format."
! 
! 
! class Gadfly_RecordSet(DBSIG2.RecordSet):
    pass
  
  
! class Gadfly_ResultSet(DBSIG2.ResultSet):
    def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      cursor.rowcount=0
      DBSIG2.ResultSet.__init__(self, dataObject, \
***************
*** 300,306 ****
  
  #
  #  Extensions to Trigger Namespaces
! #  
  class TriggerExtensions: 
  
    def __init__(self, connection): 
--- 290,296 ----
  
  #
  #  Extensions to Trigger Namespaces
! #
  class TriggerExtensions: 
  
    def __init__(self, connection): 
***************
*** 329,335 ****
  
  #
  #  All datasouce "types" and corresponding DataObject class
! # 
  supportedDataObjects = {
    'object': Gadfly_DataObject_Object,
    'sql':    Gadfly_DataObject_SQL
--- 319,325 ----
  
  #
  #  All datasouce "types" and corresponding DataObject class
! #
  supportedDataObjects = {
    'object': Gadfly_DataObject_Object,
    'sql':    Gadfly_DataObject_SQL
Index: gnue-common/src/datasources/drivers/informix/informix/DataObject.py
diff -c gnue-common/src/datasources/drivers/informix/informix/DataObject.py:1.2 
gnue-common/src/datasources/drivers/informix/informix/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/informix/informix/DataObject.py:1.2     
Tue Nov 25 12:01:34 2003
--- gnue-common/src/datasources/drivers/informix/informix/DataObject.py Tue Nov 
25 12:21:34 2003
***************
*** 40,54 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import informixdb as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: Kinfxdb for Informix [%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
--- 40,51 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! raise "This data driver has not been upgraded to the new format."
! 
! 
! import informixdb as SIG2api
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/informix/informix/RecordSet.py
diff -c gnue-common/src/datasources/drivers/informix/informix/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/informix/informix/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/informix/informix/RecordSet.py:1.2      
Tue Nov 25 12:01:34 2003
--- gnue-common/src/datasources/drivers/informix/informix/RecordSet.py  Tue Nov 
25 12:21:34 2003
***************
*** 40,54 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import informixdb as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: Kinfxdb for Informix [%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
--- 40,52 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! 
! raise "This data driver has not been upgraded to the new format."
! 
! 
! import informixdb as SIG2api
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/informix/informix/ResultSet.py
diff -c gnue-common/src/datasources/drivers/informix/informix/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/informix/informix/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/informix/informix/ResultSet.py:1.2      
Tue Nov 25 12:01:34 2003
--- gnue-common/src/datasources/drivers/informix/informix/ResultSet.py  Tue Nov 
25 12:21:34 2003
***************
*** 40,54 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import informixdb as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: Kinfxdb for Informix [%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
--- 40,52 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! 
! raise "This data driver has not been upgraded to the new format."
! 
! 
! import informixdb as SIG2api
  
  
  class Informix_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py
diff -c gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py:1.2 
gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py:1.2 Tue Nov 
25 12:01:35 2003
--- gnue-common/src/datasources/drivers/ingres/ingres/DataObject.py     Tue Nov 
25 12:21:34 2003
***************
*** 41,55 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import ingmod as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: ingmod for Ingres/Ingres II/OpenIngres 
[%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
--- 41,52 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! raise "This data driver has not been upgraded to the new format."
! 
! 
! import ingmod as SIG2api
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py
diff -c gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py:1.2  Tue Nov 
25 12:01:35 2003
--- gnue-common/src/datasources/drivers/ingres/ingres/RecordSet.py      Tue Nov 
25 12:21:34 2003
***************
*** 41,55 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
- try:
-   import ingmod as SIG2api
- except ImportError, message:
-   tmsg = _("Driver not installed: ingmod for Ingres/Ingres II/OpenIngres 
[%s]") % message
-   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
--- 41,54 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! 
! import ingmod as SIG2api
! 
! 
! raise "This data driver has not been upgraded to the new format."
  
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py
diff -c gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py:1.2  Tue Nov 
25 12:01:35 2003
--- gnue-common/src/datasources/drivers/ingres/ingres/ResultSet.py      Tue Nov 
25 12:21:34 2003
***************
*** 41,55 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import ingmod as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: ingmod for Ingres/Ingres II/OpenIngres 
[%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
--- 41,53 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! 
! raise "This data driver has not been upgraded to the new format."
! 
! 
! import ingmod as SIG2api
  
  
  class Ingres_RecordSet(DBSIG2.RecordSet):
Index: gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py:1.2    Tue Nov 
25 12:01:38 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/ResultSet.py        Tue Nov 
25 12:21:35 2003
***************
*** 31,41 ****
  
  import string
  import sys
! from gnue.common.datasources.drivers.DBSIG2.Driver import DBSIG2
! from gnue.common.datasources import GDataObjects.ConnectionError
  
! class MySQL_ResultSet(DBSIG2.ResultSet): 
!   def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None): 
      DBSIG2.ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = MySQL_RecordSet
--- 31,41 ----
  
  import string
  import sys
! from gnue.common.datasources.drivers import DBSIG2
! from gnue.common.datasources.Exceptions import ConnectionError
  
! class MySQL_ResultSet(DBSIG2.ResultSet):
!   def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      DBSIG2.ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = MySQL_RecordSet
***************
*** 47,54 ****
        self.__done = 0
        self.fetchBugFix = self.__mySqlNeedsLotsOfTLC
  
!   
!   # Compensate for MySQ bug
    def __mySqlNeedsLotsOfTLC(self):
      if self.__done:
        return None
--- 47,54 ----
        self.__done = 0
        self.fetchBugFix = self.__mySqlNeedsLotsOfTLC
  
! 
!   # Compensate for MySQL bug
    def __mySqlNeedsLotsOfTLC(self):
      if self.__done:
        return None
Index: gnue-common/src/datasources/drivers/oracle/Base/DataObject.py
diff -c gnue-common/src/datasources/drivers/oracle/Base/DataObject.py:1.2 
gnue-common/src/datasources/drivers/oracle/Base/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/oracle/Base/DataObject.py:1.2   Tue Nov 
25 12:01:40 2003
--- gnue-common/src/datasources/drivers/oracle/Base/DataObject.py       Tue Nov 
25 12:21:35 2003
***************
*** 38,44 ****
  from gnue.common.datasources.drivers import DBSIG2
  
  class _Base:
!   _escapeSingleQuote = ''''
    _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
  
  class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
--- 38,44 ----
  from gnue.common.datasources.drivers import DBSIG2
  
  class _Base:
!   _escapeSingleQuote = '\'\''
    _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
  
  class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
Index: gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py
diff -c gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.21 
gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.22
*** gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.21  Tue Nov 
25 12:01:40 2003
--- gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py       Tue Nov 
25 12:21:35 2003
***************
*** 35,43 ****
  import sys, string
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects, GConnections
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
--- 35,44 ----
  import sys, string
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects, GConnections
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
Index: gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py
diff -c gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.25 
gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.26
*** gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.25  Tue Nov 
25 12:01:40 2003
--- gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py       Tue Nov 
25 12:21:35 2003
***************
*** 36,44 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
--- 36,45 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
Index: gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
diff -c gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py:1.2 
gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py:1.2   Tue Nov 
25 12:01:45 2003
--- gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py       Tue Nov 
25 12:21:36 2003
***************
*** 59,67 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import sapdbapi as SIG2api
--- 59,67 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
  
  try:
    import sapdbapi as SIG2api
Index: gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py
diff -c gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py:1.2    Tue Nov 
25 12:01:45 2003
--- gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py        Tue Nov 
25 12:21:36 2003
***************
*** 59,67 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import sapdbapi as SIG2api
--- 59,68 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import sapdbapi as SIG2api
Index: gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py
diff -c gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py:1.2    Tue Nov 
25 12:01:45 2003
--- gnue-common/src/datasources/drivers/sapdb/sapdb/ResultSet.py        Tue Nov 
25 12:21:36 2003
***************
*** 59,73 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
! try:
!   import sapdbapi as SIG2api
! except ImportError, message:
!   tmsg = _("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
!   raise GConnections.AdapterNotInstalled, tmsg
  
  class SAP_RecordSet(DBSIG2.RecordSet):
    pass
--- 59,69 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
  
! raise "This data driver has not been upgraded to the new format."
! 
! import sapdbapi as SIG2api
  
  class SAP_RecordSet(DBSIG2.RecordSet):
    pass
Index: gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py
diff -c gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py:1.2 
gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py:1.2 Tue Nov 
25 12:01:46 2003
--- gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py     Tue Nov 
25 12:21:36 2003
***************
*** 37,45 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import sqlite as SIG2api
--- 37,46 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import sqlite as SIG2api
Index: gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py
diff -c gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py:1.2  Tue Nov 
25 12:01:46 2003
--- gnue-common/src/datasources/drivers/sqlite/sqlite/RecordSet.py      Tue Nov 
25 12:21:36 2003
***************
*** 37,45 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import sqlite as SIG2api
--- 37,46 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import sqlite as SIG2api
Index: gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py
diff -c gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py:1.2  Tue Nov 
25 12:01:46 2003
--- gnue-common/src/datasources/drivers/sqlite/sqlite/ResultSet.py      Tue Nov 
25 12:21:36 2003
***************
*** 37,45 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import sqlite as SIG2api
--- 37,46 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import sqlite as SIG2api
Index: gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py
diff -c gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py:1.2 
gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py:1.2     
Tue Nov 25 12:01:46 2003
--- gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py Tue Nov 
25 12:21:36 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
Index: gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py
diff -c gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:1.2      
Tue Nov 25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py  Tue Nov 
25 12:21:36 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
Index: gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py
diff -c gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:1.2      
Tue Nov 25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py  Tue Nov 
25 12:21:36 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    from SQLRelay import PySQLRDB as SIG2api
Index: gnue-common/src/datasources/drivers/sybase/sybase/Connection.py
diff -c gnue-common/src/datasources/drivers/sybase/sybase/Connection.py:1.2 
gnue-common/src/datasources/drivers/sybase/sybase/Connection.py:1.3
*** gnue-common/src/datasources/drivers/sybase/sybase/Connection.py:1.2 Tue Nov 
25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sybase/sybase/Connection.py     Tue Nov 
25 12:21:37 2003
***************
*** 52,58 ****
    raise GConnections.AdapterNotInstalled, tmsg
  
  
! class Connection(DBSIG2.Connection)
    _DatabaseError = SIG2api.DatabaseError
    supportedDataObjects = {
      'object': DataObject_Object,
--- 52,58 ----
    raise GConnections.AdapterNotInstalled, tmsg
  
  
! class Connection(DBSIG2.Connection):
    _DatabaseError = SIG2api.DatabaseError
    supportedDataObjects = {
      'object': DataObject_Object,
Index: gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py
diff -c gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py:1.2 
gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py:1.3
*** gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py:1.2 Tue Nov 
25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py     Tue Nov 
25 12:21:37 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import Sybase as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import Sybase as SIG2api
Index: gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py
diff -c gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py:1.2 
gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py:1.3
*** gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py:1.2  Tue Nov 
25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py      Tue Nov 
25 12:21:37 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import Sybase as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import Sybase as SIG2api
Index: gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py
diff -c gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py:1.2 
gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py:1.3
*** gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py:1.2  Tue Nov 
25 12:01:47 2003
--- gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py      Tue Nov 
25 12:21:37 2003
***************
*** 41,49 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
  
  try:
    import Sybase as SIG2api
--- 41,50 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! raise "This data driver has not been upgraded to the new format."
! 
  
  try:
    import Sybase as SIG2api
Index: gnue-common/src/rpc/drivers/soap/soappy/Driver.py
diff -c gnue-common/src/rpc/drivers/soap/soappy/Driver.py:1.1 
gnue-common/src/rpc/drivers/soap/soappy/Driver.py:1.2
*** gnue-common/src/rpc/drivers/soap/soappy/Driver.py:1.1       Mon Sep 22 
18:48:31 2003
--- gnue-common/src/rpc/drivers/soap/soappy/Driver.py   Tue Nov 25 12:21:37 2003
***************
*** 25,31 ****
  # Set of classes that implement the SOAP server driver for GNUe Comm.
  #
  # NOTES:
! # Requires python-soappy from 
  # 
  #
  # Server Parameters:
--- 25,31 ----
  # Set of classes that implement the SOAP server driver for GNUe Comm.
  #
  # NOTES:
! # Requires python-soappy from
  # 
  #
  # Server Parameters:
***************
*** 48,54 ****
  except ImportError:
    print _("\nUnable to load SOAP.py.  To use the SOAP interface, \n") \
        + _("please install SOAP.py from:\n") \
!       + "    http://sourceforge.net/projects/pywebsvcs\n";
        + _("the appropriate DEBIAN package is python-soappy")
    sys.exit()
  
--- 48,54 ----
  except ImportError:
    print _("\nUnable to load SOAP.py.  To use the SOAP interface, \n") \
        + _("please install SOAP.py from:\n") \
!       + "    http://sourceforge.net/projects/pywebsvcs\n"; \
        + _("the appropriate DEBIAN package is python-soappy")
    sys.exit()
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]