[SQL-CVS] r3949 - in SQLObject/trunk: docs sqlobject

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

Author: phd
Date: 2009-08-13 10:15:48 -0600 (Thu, 13 Aug 2009)
New Revision: 3949

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/__init__.py
Log:
Removed deprecated functions.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-08-13 16:02:37 UTC (rev 3948)
+++ SQLObject/trunk/docs/News.txt	2009-08-13 16:15:48 UTC (rev 3949)
@@ -13,7 +13,7 @@
 Features & Interface
 --------------------
 
-* Removed the last remaininig deprecated attribute.
+* Removed deprecated attribute and functions.
 
 SQLObject 0.11
 ==============

Modified: SQLObject/trunk/sqlobject/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:02:37 UTC (rev 3948)
+++ SQLObject/trunk/sqlobject/__init__.py	2009-08-13 16:15:48 UTC (rev 3949)
@@ -2,53 +2,11 @@
 SQLObject 0.12
 """
 
-from main import *
+from dbconnection import connectionForURI
 from col import *
+from index import *
+from joins import *
+from main import *
 from sqlbuilder import AND, OR, NOT, IN, LIKE, RLIKE, DESC, CONTAINSSTRING, const, func
 from styles import *
-from joins import *
-from index import *
-from dbconnection import connectionForURI
 import dberrors
-
-## Each of these imports allows the driver to install itself
-## Then we set up some backward compatibility
-
-def _warn(msg):
-    import warnings
-    warnings.warn(msg, DeprecationWarning, stacklevel=2)
-
-import firebird as _firebird
-def FirebirdConnection(*args, **kw):
-    _warn('FirebirdConnection is deprecated; use connectionForURI("firebird://...") or "from sqlobject.firebird import builder; FirebirdConnection = builder()"')
-    return _firebird.builder()(*args, **kw)
-
-import mysql as _mysql
-def MySQLConnection(*args, **kw):
-    _warn('MySQLConnection is deprecated; use connectionForURI("mysql://...") or "from sqlobject.mysql import builder; MySQLConnection = builder()"')
-    return _mysql.builder()(*args, **kw)
-
-import postgres as _postgres
-def PostgresConnection(*args, **kw):
-    _warn('PostgresConnection is deprecated; use connectionForURI("postgres://...") or "from sqlobject.postgres import builder; PostgresConnection = builder()"')
-    return _postgres.builder()(*args, **kw)
-
-import sqlite as _sqlite
-def SQLiteConnection(*args, **kw):
-    _warn('SQLiteConnection is deprecated; use connectionForURI("sqlite://...") or "from sqlobject.sqlite import builder; SQLiteConnection = builder()"')
-    return _sqlite.builder()(*args, **kw)
-
-import sybase as _sybase
-def SybaseConnection(*args, **kw):
-    _warn('SybaseConnection is deprecated; use connectionForURI("sybase://...") or "from sqlobject.sybase import builder; SybaseConnection = builder()"')
-    return _sybase.builder()(*args, **kw)
-
-import maxdb as _maxdb
-def MaxdbConnection(*args, **kw):
-    _warn('MaxdbConnection is deprecated; use connectionForURI("maxdb://...") or "from sqlobject.maxdb import builder; MaxdbConnection = builder()"')
-    return _maxdb.builder()(*args, **kw)
-
-import mssql as _mssql
-def MSSQLConnection(*args, **kw):
-        _warn('MssqlConnection is deprecated; use connectionForURI("mssql://...") or "from sqlobject.mssql import builder; MSSQLConnection = builder()"')
-        return _mssql.builder()(*args, **kw)