Author: phd
Date: 2010-01-06 09:00:51 -0700 (Wed, 06 Jan 2010)
New Revision: 4071
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/col.py
SQLObject/trunk/sqlobject/dbconnection.py
Log:
Merged a bugfix from revision 4069 - if dbEncoding is None suppose it's 'ascii'.
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2010-01-06 15:59:10 UTC (rev 4070)
+++ SQLObject/trunk/docs/News.txt 2010-01-06 16:00:51 UTC (rev 4071)
@@ -15,7 +15,7 @@
* Fixed three bugs in PostgresConnection.
-* A change ported from `SQLObject 0.11.3`_.
+* A number of changes ported from `SQLObject 0.11.3`_.
SQLObject 0.12
==============
@@ -70,6 +70,9 @@
SQLObject 0.11.3
================
+* Fixed a bug in col.py and dbconnection.py - if dbEncoding is None suppose
+ it's 'ascii'.
+
* Fixed a bug in FirebirdConnection.
* A change ported from `SQLObject 0.10.9`_.
Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py 2010-01-06 15:59:10 UTC (rev 4070)
+++ SQLObject/trunk/sqlobject/col.py 2010-01-06 16:00:51 UTC (rev 4071)
@@ -514,7 +514,7 @@
return None
if isinstance(value, unicode):
connection = state.soObject._connection
- dbEncoding = getattr(connection, "dbEncoding", "ascii")
+ dbEncoding = getattr(connection, "dbEncoding") or "ascii"
return value.encode(dbEncoding)
return value
@@ -525,7 +525,7 @@
return value
if isinstance(value, unicode):
connection = state.soObject._connection
- dbEncoding = getattr(connection, "dbEncoding", "ascii")
+ dbEncoding = getattr(connection, "dbEncoding") or "ascii"
return value.encode(dbEncoding)
return value
@@ -1485,7 +1485,7 @@
return None
if isinstance(value, unicode):
connection = state.soObject._connection
- dbEncoding = getattr(connection, "dbEncoding", "ascii")
+ dbEncoding = getattr(connection, "dbEncoding") or "ascii"
value = value.encode(dbEncoding)
if isinstance(value, str):
return pickle.loads(value)
Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py 2010-01-06 15:59:10 UTC (rev 4070)
+++ SQLObject/trunk/sqlobject/dbconnection.py 2010-01-06 16:00:51 UTC (rev 4071)
@@ -31,7 +31,7 @@
def __init__(self, connection, loglevel):
# loglevel: None or empty string for stdout; or 'stderr'
self.loglevel = loglevel or "stdout"
- self.dbEncoding = getattr(connection, "dbEncoding", "ascii")
+ self.dbEncoding = getattr(connection, "dbEncoding") or "ascii"
def write(self, text):
logfile = getattr(sys, self.loglevel)
if isinstance(text, unicode):
|
