[SQL-CVS] r433 - home/phd/SQLObject/inheritance/sqlobject

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

Author: phd
Date: 2004-12-03 09:25:17 +0000 (Fri, 03 Dec 2004)
New Revision: 433

Modified:
   home/phd/SQLObject/inheritance/sqlobject/main.py
Log:
Merged patch for rev 432: convert dbValue back toPython.


Modified: home/phd/SQLObject/inheritance/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/main.py	2004-12-03 09:24:29 UTC (rev 432)
+++ home/phd/SQLObject/inheritance/sqlobject/main.py	2004-12-03 09:25:17 UTC (rev 433)
@@ -894,9 +894,14 @@
         # _SO_creating is special, see _SO_setValue
         if self._SO_creating or self._lazyUpdate:
             for name, value in kw.items():
-                fromPy = getattr(self, '_SO_fromPython_%s' % name, None)
-                if fromPy:
-                    kw[name] = fromPy(value, self._SO_validatorState)
+                fromPython = getattr(self, '_SO_fromPython_%s' % name, None)
+                if fromPython:
+                    kw[name] = dbValue = fromPython(value, self._SO_validatorState)
+                else:
+                    dbValue = value
+                toPython = getattr(self, '_SO_toPython_%s' % name, None)
+                if toPython:
+                    value = toPython(dbValue, self._SO_validatorState)
                 setattr(self, instanceName(name), value)
             for name, value in extra.items():
                 try:
@@ -930,9 +935,12 @@
                     dbValue = fromPython(value, self._SO_validatorState)
                 else:
                     dbValue = value
-                toUpdate[name] = dbValue
+                toPython = getattr(self, '_SO_toPython_%s' % name, None)
+                if toPython:
+                    value = toPython(dbValue, self._SO_validatorState)
                 if self._cacheValues:
                     setattr(self, instanceName(name), value)
+                toUpdate[name] = dbValue
             for name, value in extra.items():
                 try:
                     getattr(self.__class__, name)