Merge exception cleanup

Author: nielsvanoch

keyvaluestore/exceptions.py

@@ -2,8 +2,6 @@
 from django.core.cache import cache
 from django.utils.translation import ugettext as _
 
-from keyvaluestore.exceptions import KeyNotExistingException
-
 class KeyValueStoreManager(models.Manager):
     def get_value_for_key(self, key):
         key = key.upper()
@@ -17,6 +15,6 @@ def get_value_for_key(self, key):
 
                 return obj.value
             except:
-                raise KeyNotExistingException(_(u"The request key '%s' could not be found." % (key,)))
+                raise KeyError(_(u"The request key '%s' could not be found." % (key,)))
         else:
             return cached

keyvaluestore/managers.py

@@ -1,6 +1,4 @@
 from keyvaluestore.models import KeyValueStore
-from keyvaluestore.exceptions import KeyNotExistingException
-
 
 def get_value_for_key(key):
     return KeyValueStore.objects.get_value_for_key(key)
@@ -9,7 +7,7 @@ def get_value_for_key(key):
 def get_value_or_default(key, default):
     try:
         value = get_value_for_key(key)
-    except KeyNotExistingException:
+    except KeyError:
         value = default
     return value