Author: phd
Date: 2009-12-30 18:38:46 -0700 (Wed, 30 Dec 2009)
New Revision: 4066
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/postgres/pgconnection.py
Log:
Merged a bugfix for PostgresConnection from r4065.
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2009-12-31 01:35:47 UTC (rev 4065)
+++ SQLObject/trunk/docs/News.txt 2009-12-31 01:38:46 UTC (rev 4066)
@@ -13,7 +13,7 @@
SQLObject 0.12.1
================
-* Fixed a bug in PostgresConnection.
+* Fixed two bugs in PostgresConnection.
* A change ported from `SQLObject 0.11.3`_.
Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py 2009-12-31 01:35:47 UTC (rev 4065)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py 2009-12-31 01:38:46 UTC (rev 4066)
@@ -99,7 +99,7 @@
self.unicodeCols = unicodeCols
self.schema = kw.pop('schema', None)
if "charset" in kw:
- self.dbEncoding = self.kw["charset"] = kw.pop("charset")
+ self.dbEncoding = kw.pop("charset")
else:
self.dbEncoding = None
DBAPI.__init__(self, **kw)
|
