Merge branch 'release/2.9.0.12'

Author: Jeremiah Porten

CHANGES.md

@@ -1,3 +1,6 @@
+Version 2.9.0.12
+ - Support: `dbsize`
+
 Version 2.9.0.11
  - Support: `scan_iter`, `sscan_iter`, `zscan_iter`, `hscan_iter`
 

mockredis/client.py

@@ -8,6 +8,7 @@
 import re
 import sys
 import time
+import fnmatch
 
 from mockredis.clock import SystemClock
 from mockredis.lock import MockRedisLock
@@ -122,13 +123,20 @@ def type(self, key):
 
     def keys(self, pattern='*'):
         """Emulate keys."""
-        # Make a regex out of pattern. The only special matching character we look for is '*'
-        regex = re.compile(b'^' + re.escape(self._encode(pattern)).replace(b'\\*', b'.*') + b'$')
+        # making sure the pattern is unicode/str.
+        try:
+            pattern = pattern.decode('utf-8')
+            # This throws an AttributeError in python 3, or an
+            # UnicodeEncodeError in python 2
+        except (AttributeError, UnicodeEncodeError):
+            pass
 
-        # Find every key that matches the pattern
-        result = [key for key in self.redis.keys() if regex.match(key)]
+        # Make regex out of glob styled pattern.
+        regex = fnmatch.translate(pattern)
+        regex = re.compile(re.sub(r'(^|[^\\])\.', r'\1[^/]', regex))
 
-        return result
+        # Find every key that matches the pattern
+        return [key for key in self.redis.keys() if regex.match(key.decode('utf-8'))]
 
     def delete(self, *keys):
         """Emulate delete."""
@@ -247,6 +255,9 @@ def _rename(self, old_key, new_key, nx=False):
             return True
         return False
 
+    def dbsize(self):
+        return len(self.redis.keys())
+
     # String Functions #
 
     def get(self, key):

mockredis/tests/test_redis.py

@@ -199,6 +199,7 @@ def test_keys_unicode(self):
         self.redis.set(key, "bar")
         eq_([key_as_utf8], self.redis.keys("*"))
         eq_([key_as_utf8], self.redis.keys("eat*"))
+        eq_([key_as_utf8], self.redis.keys("[ea]at * n?[a-z]"))
 
         unicode_prefix = b'eat \xf0\x9f\x8d\xb0*'.decode('utf-8')
         eq_([key_as_utf8], self.redis.keys(unicode_prefix))
@@ -245,3 +246,9 @@ def test_renamenx(self):
         eq_(b"bar2", self.redis.get("foo2"))
         eq_(self.redis.renamenx("foo", "foo3"), 1)
         eq_(b"bar", self.redis.get("foo3"))
+
+    def test_dbsize(self):
+        self.redis["foo"] = "bar"
+        eq_(1, self.redis.dbsize())
+        del self.redis["foo"]
+        eq_(0, self.redis.dbsize())

setup.py

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