Merge function with default

Author: nielsvanoch

keyvaluestore/utils.py

@@ -1,11 +1,22 @@
 from keyvaluestore.models import KeyValueStore
+from keyvaluestore.exceptions import KeyNotExistingException
+
 
 def get_value_for_key(key):
     return KeyValueStore.objects.get_value_for_key(key)
 
+
+def get_value_or_default(key, default):
+    try:
+        value = get_value_for_key(key)
+    except KeyNotExistingException:
+        value = default
+    return value
+
+
 def set_key_value(key, value):
-    obj,created = KeyValueStore.objects.get_or_create(key=key, defaults={'value': value})
+    obj, created = KeyValueStore.objects.get_or_create(key=key, defaults={'value': value})
     if not created:
         obj.value = value
         obj.save()
-    return True
+    return True