[SQL-CVS] r161 - trunk/SQLObject/sqlobject

[<sub...@co...>]

Author: quarl
Date: 2004-07-13 06:29:32 -0400 (Tue, 13 Jul 2004)
New Revision: 161

Modified:
   trunk/SQLObject/sqlobject/__init__.py
Log:
fix import problems; use "import as" construct

Modified: trunk/SQLObject/sqlobject/__init__.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/SQLObject/sqlobject/__init__.py	2004-07-09 16:53:03 UTC (rev 16=
0)
+++ trunk/SQLObject/sqlobject/__init__.py	2004-07-13 10:29:32 UTC (rev 16=
1)
@@ -13,52 +13,37 @@
     import warnings
     warnings.warn(msg, DeprecationWarning, stacklevel=3D2)
=20
-import firebird
-_firebird =3D firebird
-del firebird
+import firebird as _firebird
 def FirebirdConnection(*args, **kw):
     _warn('FirebirdConnection is deprecated; use connectionForURI("fireb=
ird://...") or "from sqlobject.firebird import builder; FirebirdConnectio=
n =3D builder()"')
-    _firebird.builder()(*args, **kw)
+    return _firebird.builder()(*args, **kw)
=20
-import mysql
-_mysql =3D mysql
-del mysql
+import mysql as _mysql
 def MySQLConnection(*args, **kw):
     _warn('MySQLConnection is deprecated; use connectionForURI("mysql://=
...") or "from sqlobject.mysql import builder; MySQLConnection =3D builde=
r()"')
-    _mysql.builder()(*args, **kw)
+    return _mysql.builder()(*args, **kw)
=20
-import postgres
-_postgres =3D postgres
-del postgres
+import postgres as _postgres
 def PostgresConnection(*args, **kw):
     _warn('PostgresConnection is deprecated; use connectionForURI("postg=
res://...") or "from sqlobject.postgres import builder; PostgresConnectio=
n =3D builder()"')
-    _postgres.builder()(*args, **kw)
+    return _postgres.builder()(*args, **kw)
=20
-import sqlite
-_sqlite =3D sqlite
-del sqlite
+import sqlite as _sqlite
 def SQLiteConnection(*args, **kw):
     _warn('SQLiteConnection is deprecated; use connectionForURI("sqlite:=
//...") or "from sqlobject.sqlite import builder; SQLiteConnection =3D bu=
ilder()"')
-    _sqlite.builder()(*args, **kw)
+    return _sqlite.builder()(*args, **kw)
=20
-import dbm
-_dbm =3D dbm
-del dbm
+import dbm as _dbm
 def DBMConnection(*args, **kw):
     _warn('DBMConnection is deprecated; use connectionForURI("dbm://..."=
) or "from sqlobject.dbm import builder; DBMConnection =3D builder()"')
-    _dbm.builder()(*args, **kw)
+    return _dbm.builder()(*args, **kw)
=20
-import sybase
-_sybase =3D sybase
-del sybase
+import sybase as _sybase
 def SybaseConnection(*args, **kw):
     _warn('SybaseConnection is deprecated; use connectionForURI("sybase:=
//...") or "from sqlobject.sybase import builder; SybaseConnection =3D bu=
ilder()"')
-    _sybase.builder()(*args, **kw)
+    return _sybase.builder()(*args, **kw)
=20
-
-import maxdb
-_maxdb =3D maxdb
-del maxdb
+import maxdb as _maxdb
 def MaxdbConnection(*args, **kw):
     _warn('MaxdbConnection is deprecated; use connectionForURI("maxdb://=
...") or "from sqlobject.maxdb import builder; MaxdbConnection =3D builde=
r()"')
-    _maxdb.builder()(*args, **kw)
\ No newline at end of file
+    return _maxdb.builder()(*args, **kw)