From: Scott Baker <smbaker@gmail.com>
Date: Thu, 9 Oct 2014 23:22:00 +0000 (-0700)
Subject: fix keyerror in plcorebase.delete
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=a09c0e5a4e3660dca28c615217a84cb287e7ddc7

fix keyerror in plcorebase.delete
---

diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 000e77e..57025b4 100644
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -117,14 +117,17 @@ class PlCoreBase(models.Model, DiffModelMixIn):
     def delete(self, *args, **kwds):
         # so we have something to give the observer
         purge = kwds.get('purge',False)
+        if purge:
+            del kwds['purge']
         silent = kwds.get('silent',False)
+        if silent:
+            del kwds['silent']
         try:
             purge = purge or observer_disabled
         except NameError:
             pass
 
         if (purge):
-            del kwds['purge']
             super(PlCoreBase, self).delete(*args, **kwds)
         else:
             self.deleted = True
diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py
index 1b3be29..8dc87b3 100644
--- a/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@ -135,6 +135,8 @@ class User(AbstractBaseUser, DiffModelMixIn):
     def delete(self, *args, **kwds):
         # so we have something to give the observer
         purge = kwds.get('purge',False)
+        if purge:
+            del kwds['purge']
         try:
             purge = purge or observer_disabled
         except NameError: