Author: phd
Date: 2010-04-09 12:10:07 -0600 (Fri, 09 Apr 2010)
New Revision: 4158
Modified:
SQLObject/branches/0.12/sqlobject/col.py
Log:
Merged revision 4157 from branch 0.11.
Modified: SQLObject/branches/0.12/sqlobject/col.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/col.py 2010-04-09 18:07:24 UTC (rev 4157)
+++ SQLObject/branches/0.12/sqlobject/col.py 2010-04-09 18:10:07 UTC (rev 4158)
@@ -546,7 +546,7 @@
if isinstance(value, unicode):
return value
if isinstance(value, array): # MySQL
- return unicode(value.tostring(), self.db_encoding)
+ value = value.tostring()
return unicode(value, self.db_encoding)
def from_python(self, value, state):
|
