From 0891eaad91ec82dc04c3ec2cef34ebb136880caa Mon Sep 17 00:00:00 2001 From: Benjamin Weber Date: Fri, 26 Jul 2019 10:54:59 +0200 Subject: [PATCH] upgrade support for redis-py 3.0.X --- redis_lua/script.py | 4 ++-- setup.py | 2 +- tests/test_script.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/redis_lua/script.py b/redis_lua/script.py index bd3b2d9..5cf566a 100644 --- a/redis_lua/script.py +++ b/redis_lua/script.py @@ -16,7 +16,7 @@ from collections import namedtuple from functools import partial from redis.client import Script as RedisScript -from redis.client import BasePipeline +from redis.client import Pipeline from .exceptions import error_handler from .regions import ( @@ -415,7 +415,7 @@ def runner(self, client, **kwargs): client=client, ) - if isinstance(client, BasePipeline): + if isinstance(client, Pipeline): return partial( self.convert_return_value_from_call, self.return_type, diff --git a/setup.py b/setup.py index 3d057d2..be673cd 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ 'tests', ]), install_requires=[ - 'redis>=2.10.3', + 'redis>=3.0.0', 'six>=1.10.0,<2.0.0', ], test_suite='tests', diff --git a/tests/test_script.py b/tests/test_script.py index 775e9c4..4bab6ab 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -4,7 +4,7 @@ ) from unittest import TestCase -from redis.client import BasePipeline +from redis.client import Pipeline from redis_lua.script import ( Script, @@ -853,7 +853,7 @@ def test_script_call_in_pipeline(self, redis_script): name=name, regions=regions, ) - client = MagicMock(spec=BasePipeline) + client = MagicMock(spec=Pipeline) redis_script.return_value = MagicMock(return_value=42) result = script.get_runner(client=client)()