Commit 5aab1f02 authored by Timothée Peignier's avatar Timothée Peignier Committed by Sean Bleier

add compatibility with redis-py new connection pool

parent 1ef99abe
...@@ -182,7 +182,7 @@ class CacheClass(BaseCache): ...@@ -182,7 +182,7 @@ class CacheClass(BaseCache):
""" """
Disconnect from the cache. Disconnect from the cache.
""" """
self._cache.connection.disconnect() self._cache.connection_pool.disconnect()
class RedisCache(CacheClass): class RedisCache(CacheClass):
""" """
......
...@@ -8,7 +8,7 @@ setup( ...@@ -8,7 +8,7 @@ setup(
version = "0.5.1", version = "0.5.1",
packages = ["redis_cache"], packages = ["redis_cache"],
description = "Redis Cache Backend for Django", description = "Redis Cache Backend for Django",
install_requires=['redis',], install_requires=['redis>=2.4.0',],
classifiers = [ classifiers = [
"Programming Language :: Python", "Programming Language :: Python",
"Operating System :: OS Independent", "Operating System :: OS Independent",
......
...@@ -41,17 +41,17 @@ class RedisCacheTests(unittest.TestCase): ...@@ -41,17 +41,17 @@ class RedisCacheTests(unittest.TestCase):
def test_bad_db_initialization(self): def test_bad_db_initialization(self):
self.cache = self.get_cache('redis_cache.cache://127.0.0.1:6379?db=not_a_number') self.cache = self.get_cache('redis_cache.cache://127.0.0.1:6379?db=not_a_number')
self.assertEqual(self.cache._cache.db, 1) self.assertEqual(self.cache._cache.connection_pool.connection_kwargs['db'], 1)
def test_bad_port_initialization(self): def test_bad_port_initialization(self):
self.cache = self.get_cache('redis_cache.cache://127.0.0.1:not_a_number?db=15') self.cache = self.get_cache('redis_cache.cache://127.0.0.1:not_a_number?db=15')
self.assertEqual(self.cache._cache.port, 6379) self.assertEqual(self.cache._cache.connection_pool.connection_kwargs['port'], 6379)
def test_default_initialization(self): def test_default_initialization(self):
self.cache = self.get_cache('redis_cache.cache://127.0.0.1') self.cache = self.get_cache('redis_cache.cache://127.0.0.1')
self.assertEqual(self.cache._cache.host, '127.0.0.1') self.assertEqual(self.cache._cache.connection_pool.connection_kwargs['host'], '127.0.0.1')
self.assertEqual(self.cache._cache.db, 1) self.assertEqual(self.cache._cache.connection_pool.connection_kwargs['db'], 1)
self.assertEqual(self.cache._cache.port, 6379) self.assertEqual(self.cache._cache.connection_pool.connection_kwargs['port'], 6379)
def test_simple(self): def test_simple(self):
# Simple cache set/get works # Simple cache set/get works
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment