Author: phd
Date: Sat Jan 19 11:09:27 2013
New Revision: 4572
Log:
Merged revision 4571 from branch 1.2:
fixed a problem in test_paste - connection is None
Modified:
SQLObject/branches/1.3/sqlobject/col.py
Modified: SQLObject/branches/1.3/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.3/sqlobject/col.py Sat Jan 19 11:06:10 2013 (r4571)
+++ SQLObject/branches/1.3/sqlobject/col.py Sat Jan 19 11:09:27 2013 (r4572)
@@ -505,12 +505,12 @@
return None
try:
connection = state.connection or state.soObject._connection
+ binaryType = connection._binaryType
except AttributeError:
dbEncoding = "ascii"
binaryType = type(None) # Just a simple workaround
else:
dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
- binaryType = connection._binaryType
if isinstance(value, unicode):
return value.encode(dbEncoding)
if self.dataType and isinstance(value, self.dataType):
|
