[SQL-CVS] r4143 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2010-03-22 10:14:25 -0600 (Mon, 22 Mar 2010)
New Revision: 4143

Modified:
   SQLObject/trunk/sqlobject/col.py
Log:
UnicodeColumns convert str to unicode.


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-03-22 15:56:43 UTC (rev 4142)
+++ SQLObject/trunk/sqlobject/col.py	2010-03-22 16:14:25 UTC (rev 4143)
@@ -563,10 +563,10 @@
     def from_python(self, value, state):
         if value is None:
             return None
-        if isinstance(value, (str, sqlbuilder.SQLExpression)):
+        if isinstance(value, (unicode, sqlbuilder.SQLExpression)):
             return value
-        if isinstance(value, unicode):
-            return value.encode(self.db_encoding)
+        if isinstance(value, str):
+            return unicode(value, self.db_encoding)
         raise validators.Invalid("expected a str or a unicode in the UnicodeCol '%s', got %s %r instead" % \
             (self.name, type(value), value), value, state)