Author: phd
Date: 2004-12-03 14:48:39 +0000 (Fri, 03 Dec 2004)
New Revision: 438
Modified:
trunk/SQLObject/sqlobject/main.py
Log:
Merged patch from revisions 435:437: lookup column names in self._SO_columnDict
in addition to self.__class__.
Modified: trunk/SQLObject/sqlobject/main.py
===================================================================
--- trunk/SQLObject/sqlobject/main.py 2004-12-03 14:43:51 UTC (rev 437)
+++ trunk/SQLObject/sqlobject/main.py 2004-12-03 14:48:39 UTC (rev 438)
@@ -782,7 +782,8 @@
try:
getattr(self.__class__, name)
except AttributeError:
- raise TypeError, "%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name)
+ if name not in self._SO_columnDict:
+ raise TypeError, "%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name)
try:
setattr(self, name, value)
except AttributeError, e:
@@ -820,7 +821,8 @@
try:
getattr(self.__class__, name)
except AttributeError:
- raise TypeError, "%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name)
+ if name not in self._SO_columnDict:
+ raise TypeError, "%s.set() got an unexpected keyword argument %s" % (self.__class__.__name__, name)
try:
setattr(self, name, value)
except AttributeError, e:
|
