Ticket #8077: send_signals_false_patch_correct.diff

django/db/models/base.py

@@ -167 +167 @@
 class Model(object):
     __metaclass__ = ModelBase
 
-    def __init__(self, *args, **kwargs):
-        dispatcher.send(signal=signals.pre_init, sender=self.__class__, args=args, kwargs=kwargs)
+    def __init__(self, send_signals=True, *args, **kwargs):
+        
+        #Test to see if signals are disabled for this action (send_signals=False). If not, go about as usual.
+        if send_signals:
+            dispatcher.send(signal=signals.pre_init, 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
@@ -239 +242 @@
                     pass
             if kwargs:
                 raise TypeError, "'%s' is an invalid keyword argument for this function" % kwargs.keys()[0]
-        dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
+        #Test to see if signals are disabled for this action (send_signals=False). If not, go about as usual.
+        if send_signals:
+            dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
 
     def __repr__(self):
         return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
@@ -268 +273 @@
 
     pk = property(_get_pk_val, _set_pk_val)
 
-    def save(self):
+    def save(self, send_signals=True):
         """
         Saves the current instance. Override this in a subclass if you want to
         control the saving process.
         """
-        self.save_base()
+        #Test to see if signals are disabled for this action (send_signals=False). If not, go about as usual.
+        if send_signals:
+            self.save_base()
+        else:
+            self.save_base(send_signals=False)
 
     save.alters_data = True
 
-    def save_base(self, raw=False, cls=None):
+    def save_base(self, raw=False, cls=None, send_signals=True):
         """
         Does the heavy-lifting involved in saving. Subclasses shouldn't need to
         override this method. It's separate from save() in order to hide the
@@ -288 +297 @@
             cls = self.__class__
             meta = self._meta
             signal = True
-            dispatcher.send(signal=signals.pre_save, sender=self.__class__,
-                    instance=self, raw=raw)
+                #Test to see if signals are disabled for this action (send_signals=False). If not, go about as usual.
+            if send_signals:
+                dispatcher.send(signal=signals.pre_save, sender=self.__class__,
+                            instance=self, raw=raw)
         else:
             meta = cls._meta
             signal = False
@@ -351 +362 @@
         transaction.commit_unless_managed()
 
         if signal:
-            dispatcher.send(signal=signals.post_save, sender=self.__class__,
+            #Test to see if signals are disabled for this action (send_signals=False). If not, go about as usual.
+            if send_signals:
+                    dispatcher.send(signal=signals.post_save, sender=self.__class__,
                     instance=self, created=(not record_exists), raw=raw)
 
     save_base.alters_data = True