[SQL-CVS] r4198 - SQLObject/trunk/sqlobject/postgres

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

Author: phd
Date: 2010-07-02 09:21:12 -0600 (Fri, 02 Jul 2010)
New Revision: 4198

Modified:
   SQLObject/trunk/sqlobject/postgres/pgconnection.py
Log:
Merged r4197 from branch 0.12: get unicodeCols and dbEncoding from kw.


Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	2010-07-02 15:19:22 UTC (rev 4197)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	2010-07-02 15:21:12 UTC (rev 4198)
@@ -11,8 +11,7 @@
     schemes = [dbName, 'postgresql']
 
     def __init__(self, dsn=None, host=None, port=None, db=None,
-                 user=None, password=None, backend='psycopg', unicodeCols=False,
-                 **kw):
+                 user=None, password=None, backend='psycopg', **kw):
         backends = backend
         for backend in backends.split(','):
             backend = backend.strip()
@@ -96,12 +95,9 @@
                     dsn.append('port=%d' % port)
                 dsn = ' '.join(dsn)
         self.dsn = dsn
-        self.unicodeCols = unicodeCols
+        self.unicodeCols = kw.pop('unicodeCols', False)
         self.schema = kw.pop('schema', None)
-        if "charset" in kw:
-            self.dbEncoding = kw.pop("charset")
-        else:
-            self.dbEncoding = None
+        self.dbEncoding = kw.pop("charset", None)
         DBAPI.__init__(self, **kw)
 
     def connectionFromURI(cls, uri):