Changeset 3145

Timestamp:

06/18/06 21:34:32 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1683 -- Permit initialising models using settable properties as well as
field names.

Files:

• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/tests/modeltests/properties/models.py (modified) (2 diffs)

django/trunk/django/db/models/base.py

@@ -108 +108 @@
-                val = kwargs.pop(f.attname, f.get_default())
-                setattr(self, f.attname, val)
+        for prop in kwargs.keys():
+            try:
+                if isinstance(getattr(self.__class__, prop), property):
+                    setattr(self, prop, kwargs.pop(prop))
+            except AttributeError:
+                pass
-        if kwargs:
-            raise TypeError, "'%s' is an invalid keyword argument for this function" % kwargs.keys()[0]

django/trunk/tests/modeltests/properties/models.py

@@ -13 +13 @@
-    def _get_full_name(self):
-        return "%s %s" % (self.first_name, self.last_name)
+
+    def _set_full_name(self, combined_name):
+        self.first_name, self.last_name = combined_name.split(' ', 1)
+
-    full_name = property(_get_full_name)
+
+    full_name_2 = property(_get_full_name, _set_full_name)
-
-API_TESTS = """
@@ -26 +32 @@
-    ...
-AttributeError: can't set attribute
+
+# But "full_name_2" has, and it can be used to initialise the class.
+>>> a2 = Person(full_name_2 = 'Paul McCartney')
+>>> a2.save()
+>>> a2.first_name
+'Paul'
-"""