Merge branch 'release/2.9.0.9'

Author: Jesse Myers

.travis.yml

@@ -2,6 +2,8 @@ language: python
 python:
 - '2.7'
 - '3.2'
+- '3.3'
+- '3.4'
 - pypy
 install: pip install . --use-mirrors
 script: python setup.py nosetests

CHANGES.md

@@ -1,3 +1,8 @@
+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
 
  - Add inclusive syntax (parenthesis) support for zero sets ZRANGEBYSCORE, ZREVRANGEBYSCORE  & ZREMRANGEBYSCORE

README.md

@@ -30,6 +30,14 @@ Many unit tests exist to verify correctness of mock functionality. In addition,
 unit tests support testing against an actual redis-server instance to verify the tests
 against ground truth. See `mockredis.tests.fixtures` for more details and disclaimers.
 
+## Supported python versions
+
+- Python 2.7
+- Python 3.2
+- Python 3.3
+- Python 3.4
+- PyPy
+
 ## Attribution
 
 This code is shamelessly derived from work by [John DeRosa][john].

mockredis/client.py

@@ -230,6 +230,18 @@ def flushdb(self):
         self.pubsub.clear()
         self.timeouts.clear()
 
+    def rename(self, old_key, new_key):
+        return self._rename(old_key, new_key)
+
+    def renamenx(self, old_key, new_key):
+        return 1 if self._rename(old_key, new_key, True) else 0
+
+    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)
+            return True
+        return False
+
     #### String Functions ####
 
     def get(self, key):
@@ -830,6 +842,8 @@ def value_function():
 
     def sadd(self, key, *values):
         """Emulate sadd."""
+        if len(values) == 0:
+            raise ResponseError("wrong number of arguments for 'sadd' command")
         redis_set = self._get_set(key, 'SADD', create=True)
         before_count = len(redis_set)
         redis_set.update(map(str, values))
@@ -1368,6 +1382,7 @@ def _score_inclusive(self, score):
             return False, float(score[1:])
         return True, float(score)
 
+
 def get_total_seconds(td):
     """
     For python 2.6 support

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"
+        ok_(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"
+        eq_(self.redis.renamenx("foo", "foo2"), 0)
+        eq_("bar2", self.redis.get("foo2"))
+        eq_(self.redis.renamenx("foo", "foo3"), 1)
+        eq_("bar", self.redis.get("foo3"))

mockredis/tests/test_set.py

@@ -1,5 +1,6 @@
 from nose.tools import assert_raises, eq_, ok_
 
+from mockredis.exceptions import ResponseError
 from mockredis.tests.fixtures import setup
 
 
@@ -9,6 +10,12 @@ class TestRedisSet(object):
     def setup(self):
         setup(self)
 
+    def test_sadd_empty(self):
+        key = "set"
+        values = []
+        with assert_raises(ResponseError):
+            self.redis.sadd(key, *values)
+
     def test_sadd(self):
         key = "set"
         values = ["one", "uno", "two", "three"]

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 # Match releases to redis-py versions
-__version__ = '2.9.0.8'
+__version__ = '2.9.0.9'
 
 # Jenkins will replace __build__ with a unique value.
 __build__ = ''

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py32, pypy
+envlist = py27, py32, py33, py34, pypy
 
 [testenv]
 commands = python setup.py nosetests