[SQL-CVS] r1339 - home/phd/SQLObject/paramstyles/sqlobject

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

Author: phd
Date: 2005-12-05 16:52:31 +0000 (Mon, 05 Dec 2005)
New Revision: 1339

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 1337:1338 from the trunk: a patch by Luke Opperman <lu...@me...> for plain/non-plain setters.

Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py	2005-12-05 16:51:05 UTC (rev 1338)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py	2005-12-05 16:52:31 UTC (rev 1339)
@@ -1131,6 +1131,9 @@
                 if to_python:
                     value = to_python(dbValue, self._SO_validatorState)
                 setattr(self, instanceName(name), value)
+
+            self._SO_createValues.update(kw)
+
             for name, value in extra.items():
                 try:
                     getattr(self.__class__, name)
@@ -1142,7 +1145,6 @@
                 except AttributeError, e:
                     raise AttributeError, '%s (with attribute %r)' % (e, name)
 
-            self._SO_createValues.update(kw)
             self.dirty = True
             return