commit 3d2d3e46d33967414833fc93f3420787a1cd0c08
author Scott Baker <smbaker@gmail.com> Thu Oct 09 16:22:00 2014 -0700
committer Scott Baker <smbaker@gmail.com> Thu Oct 09 16:22:00 2014 -0700
tree fcdfe6de12c39cbb3551d6268a69db2e4e605fdf
parent d29431ba255b9d182e8ac2f87897290e3cbcb7bd

fix keyerror in plcorebase.delete

planetstack/core/models/plcorebase.py

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 @@
     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

planetstack/core/models/user.py

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 @@
     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: