[SQL-CVS] r1340 - SQLObject/branches/0.7-bugfix/sqlobject

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

Author: phd
Date: 2005-12-05 17:02:18 +0000 (Mon, 05 Dec 2005)
New Revision: 1340

Modified:
   SQLObject/branches/0.7-bugfix/sqlobject/main.py
Log:
Merged rev 1338:1339 from the trunk: a patch by Luke Opperman <lu...@me...> for plain/non-plain setters.

Modified: SQLObject/branches/0.7-bugfix/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/main.py	2005-12-05 16:52:31 UTC (rev 1339)
+++ SQLObject/branches/0.7-bugfix/sqlobject/main.py	2005-12-05 17:02:18 UTC (rev 1340)
@@ -1072,6 +1072,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)
@@ -1083,7 +1086,6 @@
                 except AttributeError, e:
                     raise AttributeError, '%s (with attribute %r)' % (e, name)
 
-            self._SO_createValues.update(kw)
             self.dirty = True
             return