|
From: <sub...@co...> - 2010-07-15 14:58:51
|
Author: phd
Date: 2010-07-15 08:58:43 -0600 (Thu, 15 Jul 2010)
New Revision: 4208
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
SQLObject/trunk/sqlobject/postgres/pgconnection.py
SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Merged revision 4207 from branch 0.12: 'backend' parameter was renamed to 'driver'.
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2010-07-15 14:56:25 UTC (rev 4207)
+++ SQLObject/trunk/docs/News.txt 2010-07-15 14:58:43 UTC (rev 4208)
@@ -44,6 +44,12 @@
* A new parameter 'sslmode' was added to PostgresConnection.
+SQLObject 0.12.5
+================
+
+* 'backend' parameter was renamed to 'driver'. To preserve backward
+ compatibility 'backend' is recognized and will be recognized for some time.
+
SQLObject 0.12.4
================
Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py 2010-07-15 14:56:25 UTC (rev 4207)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py 2010-07-15 14:58:43 UTC (rev 4208)
@@ -10,24 +10,25 @@
def __init__(self, db, user, password='', host='localhost',
autoCommit=0, **kw):
- backends = kw.pop('backend', None) or 'adodb,pymssql'
- for backend in backends.split(','):
- backend = backend.strip()
- if not backend:
+ drivers = kw.pop('driver', None) or \
+ kw.pop('backend', None) or 'adodb,pymssql'
+ for driver in drivers.split(','):
+ driver = driver.strip()
+ if not driver:
continue
try:
- if backend in ('adodb', 'adodbapi'):
+ if driver in ('adodb', 'adodbapi'):
import adodbapi as sqlmodule
- elif backend == 'pymssql':
+ elif driver == 'pymssql':
import pymssql as sqlmodule
else:
- raise ValueError('Unknown MSSQL backend "%s", expected adodb or pymssql' % backend)
+ raise ValueError('Unknown MSSQL driver "%s", expected adodb or pymssql' % driver)
except ImportError:
pass
else:
break
else:
- raise ImportError('Cannot find an MSSQL backend, tried %s' % backends)
+ raise ImportError('Cannot find an MSSQL driver, tried %s' % drivers)
self.module = sqlmodule
if sqlmodule.__name__ == 'adodbapi':
Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py 2010-07-15 14:56:25 UTC (rev 4207)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py 2010-07-15 14:58:43 UTC (rev 4208)
@@ -11,34 +11,35 @@
schemes = [dbName, 'postgresql']
def __init__(self, dsn=None, host=None, port=None, db=None,
- user=None, password=None, backend='psycopg', **kw):
- backends = backend
- for backend in backends.split(','):
- backend = backend.strip()
- if not backend:
+ user=None, password=None, **kw):
+ drivers = kw.pop('driver', None) or \
+ kw.pop('backend', None) or 'psycopg'
+ for driver in drivers.split(','):
+ driver = driver.strip()
+ if not driver:
continue
try:
- if backend == 'psycopg2':
+ if driver == 'psycopg2':
import psycopg2 as psycopg
- elif backend == 'psycopg1':
+ elif driver == 'psycopg1':
import psycopg
- elif backend == 'psycopg':
+ elif driver == 'psycopg':
try:
import psycopg2 as psycopg
except ImportError:
import psycopg
- elif backend == 'pygresql':
+ elif driver == 'pygresql':
import pgdb
self.module = pgdb
else:
- raise ValueError('Unknown PostgreSQL backend "%s", expected psycopg2, psycopg1 or pygresql' % backend)
+ raise ValueError('Unknown PostgreSQL driver "%s", expected psycopg2, psycopg1 or pygresql' % driver)
except ImportError:
pass
else:
break
else:
- raise ImportError('Cannot find a PostgreSQL backend, tried %s' % backends)
- if backend.startswith('psycopg'):
+ raise ImportError('Cannot find a PostgreSQL driver, tried %s' % drivers)
+ if driver.startswith('psycopg'):
self.module = psycopg
# Register a converter for psycopg Binary type.
registerConverter(type(psycopg.Binary('')),
@@ -53,7 +54,7 @@
if host:
dsn_dict["host"] = host
if port:
- if backend == 'pygresql':
+ if driver == 'pygresql':
dsn_dict["host"] = "%s:%d" % (host, port)
else:
if psycopg.__version__.split('.')[0] == '1':
@@ -71,7 +72,7 @@
dsn_dict["sslmode"] = sslmode
self.use_dsn = dsn is not None
if dsn is None:
- if backend == 'pygresql':
+ if driver == 'pygresql':
dsn = ''
if host:
dsn += host
@@ -99,6 +100,7 @@
if sslmode:
dsn.append('sslmode=%s' % sslmode)
dsn = ' '.join(dsn)
+ self.driver = driver
self.dsn = dsn
self.unicodeCols = kw.pop('unicodeCols', False)
self.schema = kw.pop('schema', None)
@@ -326,7 +328,7 @@
# We have to connect to *some* database, so we'll connect to
# template1, which is a common open database.
# @@: This doesn't use self.use_dsn or self.dsn_dict
- if self.backend == 'pygresql':
+ if self.driver == 'pygresql':
dsn = '%s:template1:%s:%s' % (
self.host or '', self.user or '', self.password or '')
else:
Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py 2010-07-15 14:56:25 UTC (rev 4207)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py 2010-07-15 14:58:43 UTC (rev 4208)
@@ -22,29 +22,30 @@
schemes = [dbName]
def __init__(self, filename, autoCommit=1, **kw):
- backends = kw.pop('backend', None) or 'pysqlite2,sqlite3,sqlite'
- for backend in backends.split(','):
- backend = backend.strip()
- if not backend:
+ drivers = kw.pop('driver', None) or \
+ kw.pop('backend', None) or 'pysqlite2,sqlite3,sqlite'
+ for driver in drivers.split(','):
+ driver = driver.strip()
+ if not driver:
continue
try:
- if backend in ('sqlite2', 'pysqlite2'):
+ if driver in ('sqlite2', 'pysqlite2'):
from pysqlite2 import dbapi2 as sqlite
self.using_sqlite2 = True
- elif backend == 'sqlite3':
+ elif driver == 'sqlite3':
import sqlite3 as sqlite
self.using_sqlite2 = True
- elif backend in ('sqlite', 'sqlite1'):
+ elif driver in ('sqlite', 'sqlite1'):
import sqlite
self.using_sqlite2 = False
else:
- raise ValueError('Unknown SQLite backend "%s", expected pysqlite2, sqlite3 or sqlite' % backend)
+ raise ValueError('Unknown SQLite driver "%s", expected pysqlite2, sqlite3 or sqlite' % driver)
except ImportError:
pass
else:
break
else:
- raise ImportError('Cannot find an SQLite backend, tried %s' % backends)
+ raise ImportError('Cannot find an SQLite driver, tried %s' % drivers)
if self.using_sqlite2:
sqlite.encode = base64.encodestring
sqlite.decode = base64.decodestring
|
