Ticket #8077: signals_patch3.diff

django/db/models/base.py

@@ -192 +192 @@
     __metaclass__ = ModelBase
 
     def __init__(self, *args, **kwargs):
-        signals.pre_init.send(sender=self.__class__, args=args, kwargs=kwargs)
+        if send_signals:
+            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
         # overrides it. It should be one or the other; don't duplicate the work
@@ -263 +264 @@
                     pass
             if kwargs:
                 raise TypeError, "'%s' is an invalid keyword argument for this function" % kwargs.keys()[0]
-        signals.post_init.send(sender=self.__class__, instance=self)
+        if send_signals:
+            signals.post_init.send(sender=self.__class__, instance=self)
 
     def __repr__(self):
         return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
@@ -292 +294 @@
 
     pk = property(_get_pk_val, _set_pk_val)
 
-    def save(self, force_insert=False, force_update=False):
+    def save(self, send_signals=True, force_insert=False, force_update=False):
         """
         Saves the current instance. Override this in a subclass if you want to
         control the saving process.
@@ -304 +306 @@
         if force_insert and force_update:
             raise ValueError("Cannot force both insert and updating in "
                     "model saving.")
-        self.save_base(force_insert=force_insert, force_update=force_update)
+        self.save_base(send_signals=send_signals, force_insert=force_insert, force_update=force_update)
 
     save.alters_data = True
 
-    def save_base(self, raw=False, cls=None, force_insert=False,
+    def save_base(self, send_signals=True, raw=False, cls=None, force_insert=False,
             force_update=False):
         """
         Does the heavy-lifting involved in saving. Subclasses shouldn't need to
@@ -321 +323 @@
             cls = self.__class__
             meta = self._meta
             signal = True
-            signals.pre_save.send(sender=self.__class__, instance=self, raw=raw)
+            if send_signals:
+                signals.pre_save.send(sender=self.__class__, instance=self, raw=raw)
         else:
             meta = cls._meta
             signal = False
@@ -385 +388 @@
                 setattr(self, meta.pk.attname, result)
         transaction.commit_unless_managed()
 
-        if signal:
+        if signal and send_signals:
             signals.post_save.send(sender=self.__class__, instance=self,
                 created=(not record_exists), raw=raw)