[gnue] r10274 - in trunk/gnue-common: . src/datasources src/datasources/drivers/sql/interbase src/datasources/drivers/sql/maxdb src/datasources/drivers/sql/msado src/datasources/drivers/sql/mysql src/datasources/drivers/sql/oracle src/datasources/drivers/sql/postgresql src/datasources/drivers/sql/sqlite2 src/datasources/drivers/sql/sqlite3
[email protected] Thu, 16 Dec 2010 15:33:59 -0600 (CST)
| Newsgroups | gmane.comp.cms.gnue.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: reinhard Date: 2010-12-16 15:33:59 -0600 (Thu, 16 Dec 2010) New Revision: 10274 Modified: trunk/gnue-common/ trunk/gnue-common/src/datasources/GConnections.py trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv= .py trunk/gnue-common/src/datasources/drivers/sql/maxdb/maxdbdrv.py trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopg2drv.p= y trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.py trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.p= y trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.py trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py trunk/gnue-common/src/datasources/drivers/sql/sqlite3/sqlite3drv.py Log: Don't mask import errors for DBSIG2 modules, since this hides away potent= ial info about why the module could not be imported. Property changes on: trunk/gnue-common ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-16 22:21:53.016000032 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: common + timestamp: 2010-12-16 22:31:28.948999882 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: common Name: bzr:file-ids - src/base/plugin.py 9937@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2= Fgnue-common:src%2Fbase%2Fplugin.py + src/datasources/GConnections.py 1060@3a364389-8fce-0310-8f11-cc363fd= e16c7:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py src/datasources/drivers/sql/interbase/kinterbasdbdrv.py 7695@3a364389-8fc= e-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%= 2Fsql%2Finterbase%2Fkinterbasdbdrv.py src/datasources/drivers/sql/maxdb/maxdbdrv.py 7695@3a364389-8fce-0310-8f1= 1-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%2Fma= xdb%2Fmaxdbdrv.py src/datasources/drivers/sql/msado/adodbapidrv.py 7695@3a364389-8fce-0310-= 8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%2= Fmsado%2Fadodbapidrv.py src/datasources/drivers/sql/mysql/mysqldbdrv.py 7695@3a364389-8fce-0310-8= f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%2F= mysql%2Fmysqldbdrv.py src/datasources/drivers/sql/oracle/cxoracledrv.py 7695@3a364389-8fce-0310= -8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%= 2Foracle%2Fcxoracledrv.py src/datasources/drivers/sql/oracle/dcoracledrv.py 7695@3a364389-8fce-0310= -8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%= 2Foracle%2Fdcoracledrv.py src/datasources/drivers/sql/postgresql/psycopg2drv.py 8699@3a364389-8fce-= 0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2F= sql%2Fpostgresql%2Fpsycopg2drv.py src/datasources/drivers/sql/postgresql/psycopgdrv.py 7695@3a364389-8fce-0= 310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fs= ql%2Fpostgresql%2Fpsycopgdrv.py src/datasources/drivers/sql/postgresql/pygresqldrv.py 7695@3a364389-8fce-= 0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2F= sql%2Fpostgresql%2Fpygresqldrv.py src/datasources/drivers/sql/postgresql/pypgsqldrv.py 7695@3a364389-8fce-0= 310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fs= ql%2Fpostgresql%2Fpypgsqldrv.py src/datasources/drivers/sql/sqlite2/pysqlitedrv.py 7712@3a364389-8fce-031= 0-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql= %2Fsqlite2%2Fpysqlitedrv.py src/datasources/drivers/sql/sqlite3/pysqlite2drv.py 7713@3a364389-8fce-03= 10-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsq= l%2Fsqlite3%2Fpysqlite2drv.py src/datasources/drivers/sql/sqlite3/sqlite3drv.py 9865@3a364389-8fce-0310= -8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2Fsql%= 2Fsqlite3%2Fsqlite3drv.py Name: bzr:revision-id:v4 - 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] + 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] Name: bzr:text-parents - src/base/plugin.py svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-= 8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10035 + src/datasources/GConnections.py [email protected]= 2232811-ydwqz1rwr8a17fad src/datasources/drivers/sql/interbase/kinterbasdbdrv.py svn-v3-single1-dH= J1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-= common:9954 src/datasources/drivers/sql/maxdb/maxdbdrv.py svn-v3-single1-dHJ1bmsvZ251= ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:995= 4 src/datasources/drivers/sql/msado/adodbapidrv.py svn-v3-single1-dHJ1bmsvZ= 251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:= 9954 src/datasources/drivers/sql/mysql/mysqldbdrv.py svn-v3-single1-dHJ1bmsvZ2= 51ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:1= 0152 src/datasources/drivers/sql/oracle/cxoracledrv.py svn-v3-single1-dHJ1bmsv= Z251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common= :9954 src/datasources/drivers/sql/oracle/dcoracledrv.py svn-v3-single1-dHJ1bmsv= Z251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common= :9954 src/datasources/drivers/sql/postgresql/psycopg2drv.py svn-v3-single1-dHJ1= bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-co= mmon:9954 src/datasources/drivers/sql/postgresql/psycopgdrv.py svn-v3-single1-dHJ1b= msvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-com= mon:9954 src/datasources/drivers/sql/postgresql/pygresqldrv.py svn-v3-single1-dHJ1= bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-co= mmon:9954 src/datasources/drivers/sql/postgresql/pypgsqldrv.py svn-v3-single1-dHJ1b= msvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-com= mon:9954 src/datasources/drivers/sql/sqlite2/pysqlitedrv.py svn-v3-single1-dHJ1bms= vZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-commo= n:9954 src/datasources/drivers/sql/sqlite3/pysqlite2drv.py svn-v3-single1-dHJ1bm= svZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-comm= on:9954 src/datasources/drivers/sql/sqlite3/sqlite3drv.py svn-v3-single1-dHJ1bmsv= Z251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common= :9954 Modified: trunk/gnue-common/src/datasources/GConnections.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/GConnections.py 2010-12-16 21:22:17= UTC (rev 10273) +++ trunk/gnue-common/src/datasources/GConnections.py 2010-12-16 21:33:59= UTC (rev 10274) @@ -47,22 +47,6 @@ =20 # ----------------------------------------------------------------------= ------- =20 -class DependencyError (errors.AdminError): - """ - Cannot load database driver plugin due to a missing dependency. - - This exception is raised by the database drivers. - """ - def __init__ (self, modulename, url): - self.modulename =3D modulename - self.url =3D url - message =3D u_("Module '%s' is not installed.") % self.modulename - if self.url: - message +=3D u_(" You can download it from %s.") % self.url - errors.AdminError.__init__ (self, message) - -# ----------------------------------------------------------------------= ------- - class InvalidFormatError (errors.AdminError): """ Cannot parse connections.conf file. Modified: trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterb= asdbdrv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdr= v.py 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdr= v.py 2010-12-16 21:33:59 UTC (rev 10274) @@ -39,14 +39,9 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import kinterbasdb + import kinterbasdb =20 - except ImportError: - raise GConnections.DependencyError, ('kinterbasdb', None) =20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D # Driver info # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/maxdb/maxdbdrv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/maxdb/maxdbdrv.py 2010-= 12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/maxdb/maxdbdrv.py 2010-= 12-16 21:33:59 UTC (rev 10274) @@ -38,14 +38,9 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import sapdb.dbapi + import sapdb.dbapi =20 - except ImportError: - raise GConnections.DependencyError, ('sapdb', None) =20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D # Driver info # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv= .py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py 20= 10-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py 20= 10-12-16 21:33:59 UTC (rev 10274) @@ -36,15 +36,8 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import adodbapi - except ImportError: - raise GConnections.DependencyError, ('adodbapi', None) - try: - import win32com - except ImportError: - raise GConnections.DependencyError, ('win32com', None) + import adodbapi + import win32com =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.= py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py 201= 0-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py 201= 0-12-16 21:33:59 UTC (rev 10274) @@ -38,12 +38,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import MySQLdb - except ImportError: - raise GConnections.DependencyError ('mysql-python', - 'http://sourceforge.net/projects/mysql-python') + import MySQLdb =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledr= v.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py 2= 010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py 2= 010-12-16 21:33:59 UTC (rev 10274) @@ -37,11 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import cx_Oracle - except ImportError: - raise GConnections.DependencyError, ('cx_Oracle', None) + import cx_Oracle =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledr= v.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py 2= 010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py 2= 010-12-16 21:33:59 UTC (rev 10274) @@ -37,11 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import DCOracle2 - except ImportError: - raise GConnections.DependencyError ('DCOracle2', None) + import DCOracle2 =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycop= g2drv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopg2drv.= py 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopg2drv.= py 2010-12-16 21:33:59 UTC (rev 10274) @@ -37,11 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import psycopg2 - except: - raise GConnections.DependencyError, ('psycopg2', None) + import psycopg2 =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycop= gdrv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.p= y 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.p= y 2010-12-16 21:33:59 UTC (rev 10274) @@ -37,11 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import psycopg - except: - raise GConnections.DependencyError, ('psycopg', None) + import psycopg =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygres= qldrv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.= py 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.= py 2010-12-16 21:33:59 UTC (rev 10274) @@ -38,11 +38,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import pgdb - except ImportError: - raise GConnections.DependencyError, ('pygresql', None) + import pgdb =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsq= ldrv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.p= y 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.p= y 2010-12-16 21:33:59 UTC (rev 10274) @@ -37,11 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - from pyPgSQL import PgSQL - except: - raise GConnections.DependencyError, ('pyPgSQL', None) + from pyPgSQL import PgSQL =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlited= rv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py = 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py = 2010-12-16 21:33:59 UTC (rev 10274) @@ -36,25 +36,20 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - import sqlite - =20 - # This is a workaround for a bug in PySQLite. All the following mebe= rs are - # not imported from main.py in __init__.py=20 - if not hasattr (sqlite, 'Timestamp') and sqlite.main.have_datetime: - sqlite.Date =3D sqlite.main.Date - sqlite.Time =3D sqlite.main.Time - sqlite.Timestamp =3D sqlite.main.Timestamp - sqlite.DateFromTicks =3D sqlite.main.DateFromTicks - sqlite.TimeFromTicks =3D sqlite.main.TimeFromTicks - sqlite.TimestampFromTicks =3D sqlite.main.TimestampFromTicks + import sqlite =20 - sqlite.DateTimeType =3D sqlite.main.DateTimeType - sqlite.DateTimeDeltaType =3D sqlite.main.DateTimeDeltaType + # This is a workaround for a bug in PySQLite. All the following mebers= are + # not imported from main.py in __init__.py=20 + if not hasattr (sqlite, 'Timestamp') and sqlite.main.have_datetime: + sqlite.Date =3D sqlite.main.Date + sqlite.Time =3D sqlite.main.Time + sqlite.Timestamp =3D sqlite.main.Timestamp + sqlite.DateFromTicks =3D sqlite.main.DateFromTicks + sqlite.TimeFromTicks =3D sqlite.main.TimeFromTicks + sqlite.TimestampFromTicks =3D sqlite.main.TimestampFromTicks =20 - except ImportError: - raise GConnections.DependencyError, ('SQLitedbapi', None) + sqlite.DateTimeType =3D sqlite.main.DateTimeType + sqlite.DateTimeDeltaType =3D sqlite.main.DateTimeDeltaType =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2= drv.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py= 2010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py= 2010-12-16 21:33:59 UTC (rev 10274) @@ -37,12 +37,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - from pysqlite2 import dbapi2 - =20 - except ImportError: - raise GConnections.DependencyError, ('pysqlite2.dbapi2', None) + from pysqlite2 import dbapi2 =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite3/sqlite3dr= v.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-common/src/datasources/drivers/sql/sqlite3/sqlite3drv.py 2= 010-12-16 21:22:17 UTC (rev 10273) +++ trunk/gnue-common/src/datasources/drivers/sql/sqlite3/sqlite3drv.py 2= 010-12-16 21:33:59 UTC (rev 10274) @@ -38,12 +38,7 @@ # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 def __initplugin__ (): - from gnue.common.datasources import GConnections - try: - # Python >=3D 2.5 has sqlite3 package in the standard library - from sqlite3 import dbapi2 - except ImportError: - raise GConnections.DependencyError, ('sqlite3.dbapi2', None) + from sqlite3 import dbapi2 =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D