[SQL-CVS] r4196 - SQLObject/branches/0.11/sqlobject/postgres

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

Author: phd
Date: 2010-07-02 09:15:00 -0600 (Fri, 02 Jul 2010)
New Revision: 4196

Modified:
   SQLObject/branches/0.11/sqlobject/postgres/pgconnection.py
Log:
Get unicodeCols from kw.


Modified: SQLObject/branches/0.11/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/postgres/pgconnection.py	2010-05-11 20:32:50 UTC (rev 4195)
+++ SQLObject/branches/0.11/sqlobject/postgres/pgconnection.py	2010-07-02 15:15:00 UTC (rev 4196)
@@ -13,8 +13,7 @@
     schemes = [dbName, 'postgresql', 'psycopg']
 
     def __init__(self, dsn=None, host=None, port=None, db=None,
-                 user=None, password=None, usePygresql=False, unicodeCols=False,
-                 **kw):
+                 user=None, password=None, usePygresql=False, **kw):
         global psycopg, pgdb
         self.usePygresql = usePygresql
         if usePygresql:
@@ -84,7 +83,7 @@
                     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)
         DBAPI.__init__(self, **kw)