Ticket #4102: 4102_django-1.1.patch

django/db/models/base.py

@@ -240 +240 @@
-class Model(object):
-    __metaclass__ = ModelBase
-    _deferred = False
+    
+    def __setattr__(self, name, value):
+        if name not in self._modified_attrs:
+            if not hasattr(self, name) or value != getattr(self, name):
+                self._modified_attrs.append(name)
+        super(Model, self).__setattr__(name, value)
+    
+    def _reset_modified_attrs(self):
+        self.__dict__['_modified_attrs'] = []
-
-    def __init__(self, *args, **kwargs):
+        self._reset_modified_attrs()
-        signals.pre_init.send(sender=self.__class__, args=args, kwargs=kwargs)
-
-        # There is a rather weird disparity here; if kwargs, it's set, then args
@@ -458 +468 @@
-
-        if not meta.proxy:
-            non_pks = [f for f in meta.local_fields if not f.primary_key]
-
+
+
+
+
-            # First, try an UPDATE. If that doesn't update anything, do an INSERT.
-            pk_val = self._get_pk_val(meta)
-            pk_set = pk_val is not None