Merge branch 'jgargallo-develop' into develop

Author: Jesse Myers

CHANGES.md

@@ -1,3 +1,6 @@
+Version 2.9.0.9
+
+ - Support: RENAME and RENAMENX
  - SADD will raise an exception if an empty list is passed to it
 
 Version 2.9.0.8

mockredis/client.py

@@ -230,6 +230,16 @@ def flushdb(self):
         self.pubsub.clear()
         self.timeouts.clear()
 
+    def rename(self, old_key, new_key):
+        self._rename(old_key, new_key)
+
+    def renamenx(self, old_key, new_key):
+        self._rename(old_key, new_key, True)
+
+    def _rename(self, old_key, new_key, nx=False):
+        if old_key in self.redis and (not nx or new_key not in self.redis):
+            self.redis[new_key] = self.redis.pop(old_key)
+
     #### String Functions ####
 
     def get(self, key):

mockredis/tests/test_redis.py

@@ -208,3 +208,16 @@ def test_delitem(self):
         eq_(None, self.redis.get("foo"))
         # redispy does not correctly raise KeyError here, so we don't either
         del self.redis["foo"]
+
+    def test_rename(self):
+        self.redis["foo"] = "bar"
+        self.redis.rename("foo", "new_foo")
+        eq_("bar", self.redis.get("new_foo"))
+
+    def test_renamenx(self):
+        self.redis["foo"] = "bar"
+        self.redis["foo2"] = "bar2"
+        self.redis.renamenx("foo", "foo2")
+        eq_("bar2", self.redis.get("foo2"))
+        self.redis.renamenx("foo", "foo3")
+        eq_("bar", self.redis.get("foo3"))