[SQL-CVS] r4329 - in SQLObject/trunk: docs sqlobject/mssql sqlobject/postgres sqlobject/rdbhost sqlobject/sqlite

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

Author: phd
Date: Wed Jan 26 07:34:09 2011
New Revision: 4329

Log:
Parameter 'backend' in DB URI is no longer supported, use parameter 'driver'.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
   SQLObject/trunk/sqlobject/postgres/pgconnection.py
   SQLObject/trunk/sqlobject/rdbhost/rdbhostconnection.py
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/docs/News.txt	Wed Jan 26 07:34:09 2011	(r4329)
@@ -13,6 +13,8 @@
 Features & Interface
 --------------------
 
+* Parameter 'backend' in DB URI is no longer supported, use parameter 'driver'.
+
 SQLObject 0.15.1
 ================
 

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/docs/TODO.txt	Wed Jan 26 07:34:09 2011	(r4329)
@@ -1,8 +1,6 @@
 TODO
 ----
 
-* Stop supporting parameter 'backend'.
-
 * Proper %-encoded URI.
 
 * __version__.py

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Wed Jan 26 07:34:09 2011	(r4329)
@@ -10,8 +10,7 @@
 
     def __init__(self, db, user, password='', host='localhost',
                  autoCommit=0, **kw):
-        drivers = kw.pop('driver', None) or \
-            kw.pop('backend', None) or 'adodb,pymssql'
+        drivers = kw.pop('driver', None) or 'adodb,pymssql'
         for driver in drivers.split(','):
             driver = driver.strip()
             if not driver:

Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	Wed Jan 26 07:34:09 2011	(r4329)
@@ -12,8 +12,7 @@
 
     def __init__(self, dsn=None, host=None, port=None, db=None,
                  user=None, password=None, **kw):
-        drivers = kw.pop('driver', None) or \
-            kw.pop('backend', None) or 'psycopg'
+        drivers = kw.pop('driver', None) or 'psycopg'
         for driver in drivers.split(','):
             driver = driver.strip()
             if not driver:

Modified: SQLObject/trunk/sqlobject/rdbhost/rdbhostconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/rdbhost/rdbhostconnection.py	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/sqlobject/rdbhost/rdbhostconnection.py	Wed Jan 26 07:34:09 2011	(r4329)
@@ -18,15 +18,15 @@
     schemes = [dbName]
 
     def __init__(self, dsn=None, host=None, port=None, db=None,
-                 user=None, password=None, backend='rdbhost', unicodeCols=False,
+                 user=None, password=None, unicodeCols=False, driver='rdbhost',
                  **kw):
-        backends = backend
-        for backend in backends.split(','):
-            backend = backend.strip()
-            if not backend:
+        drivers = driver
+        for driver in drivers.split(','):
+            driver = driver.strip()
+            if not driver:
                 continue
             try:
-                if backend == 'rdbhost':
+                if driver == 'rdbhost':
                     from rdbhdb import rdbhdb as rdb
                     # monkey patch % escaping into Cursor._execute
                     old_execute = getattr(rdb.Cursor, '_execute')
@@ -38,13 +38,13 @@
                     setattr(rdb.Cursor, '_execute', _execute)
                     self.module = rdb
                 else:
-                    raise ValueError('Unknown Rdbhost backend %s'%backend)
+                    raise ValueError('Unknown Rdbhost driver %s' % driver)
             except ImportError:
                 pass
             else:
                 break
         else:
-            raise ImportError('Cannot find the Rdbhost backend')
+            raise ImportError('Cannot find the Rdbhost driver')
         self.user = user
         self.host = host
         self.port = port

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Wed Jan 26 07:24:28 2011	(r4328)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Wed Jan 26 07:34:09 2011	(r4329)
@@ -22,8 +22,7 @@
     schemes = [dbName]
 
     def __init__(self, filename, autoCommit=1, **kw):
-        drivers = kw.pop('driver', None) or \
-            kw.pop('backend', None) or 'pysqlite2,sqlite3,sqlite'
+        drivers = kw.pop('driver', None) or 'pysqlite2,sqlite3,sqlite'
         for driver in drivers.split(','):
             driver = driver.strip()
             if not driver: