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

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

Author: phd
Date: 2005-01-05 12:13:34 +0000 (Wed, 05 Jan 2005)
New Revision: 511

Modified:
   trunk/SQLObject/sqlobject/col.py
Log:
Do not convert str in UnicodeStringValidator.fromPython();
do not convert unicode in UnicodeStringValidator.toPython().


Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py	2005-01-05 12:08:42 UTC (rev 510)
+++ trunk/SQLObject/sqlobject/col.py	2005-01-05 12:13:34 UTC (rev 511)
@@ -346,11 +346,15 @@
     def fromPython(self, value, state):
         if value is None:
             return None
+        if isinstance(value, str):
+            return value
         return value.encode(self.db_encoding)
 
     def toPython(self, value, state):
         if value is None:
             return None
+        if isinstance(value, unicode):
+           return value
         return unicode(value, self.db_encoding)
 
 class SOUnicodeCol(SOStringCol):