Merge pull request #158 from samupl/support_default

Add support for default value in get()

2 files changed, 18 insertions, 4 deletions

diff --git a/memcache.py b/memcache.py
index 06f1efb..09cac56 100644
--- a/memcache.py
+++ b/memcache.py
@@ -1064,7 +1064,7 @@ class Client(threading.local):
                 server.mark_dead(msg)
             return 0
 
-    def _get(self, cmd, key):
+    def _get(self, cmd, key, default=None):
         key = self._encode_key(key)
         if self.do_check_key:
             self.check_key(key)
@@ -1093,7 +1093,7 @@ class Client(threading.local):
                     )
 
                 if not rkey:
-                    return None
+                    return default
                 try:
                     value = self._recv_value(server, flags, rlen)
                 finally:
@@ -1118,12 +1118,12 @@ class Client(threading.local):
                 server.mark_dead(msg)
             return None
 
-    def get(self, key):
+    def get(self, key, default=None):
         '''Retrieves a key from the memcache.
 
         @return: The value or None.
         '''
-        return self._get('get', key)
+        return self._get('get', key, default)
 
     def gets(self, key):
         '''Retrieves a key from the memcache. Used in conjunction with 'cas'.
diff --git a/tests/test_memcache.py b/tests/test_memcache.py
index 621ac5c..d0f4857 100644
--- a/tests/test_memcache.py
+++ b/tests/test_memcache.py
@@ -54,6 +54,20 @@ class TestMemcache(unittest.TestCase):
         self.assertEqual(result, True)
         self.assertEqual(self.mc.get("long"), None)
 
+    def test_default(self):
+        key = "default"
+        default = object()
+        result = self.mc.get(key, default=default)
+        self.assertEqual(result, default)
+
+        self.mc.set("default", None)
+        result = self.mc.get(key, default=default)
+        self.assertIsNone(result)
+
+        self.mc.set("default", 123)
+        result = self.mc.get(key, default=default)
+        self.assertEqual(result, 123)
+
     @mock.patch.object(_Host, 'send_cmd')
     @mock.patch.object(_Host, 'readline')
     def test_touch(self, mock_readline, mock_send_cmd):