X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ricsdl-package%2Fricsdl%2Fbackend%2Fredis.py;fp=ricsdl-package%2Fricsdl%2Fbackend%2Fredis.py;h=3ebc8cb324d5a56255e875f04ad9c9149e89ac78;hb=6a906b7852d851b850eca5f3cee80362a6ea10a4;hp=1c549dbc5e5cf1bac3a430605517c75d8da4de65;hpb=56f82fedfbfd59f13bcdb4a1e3776a61b434901b;p=ric-plt%2Fsdlpy.git diff --git a/ricsdl-package/ricsdl/backend/redis.py b/ricsdl-package/ricsdl/backend/redis.py index 1c549db..3ebc8cb 100755 --- a/ricsdl-package/ricsdl/backend/redis.py +++ b/ricsdl-package/ricsdl/backend/redis.py @@ -28,7 +28,7 @@ import redis from redis import Redis from redis.sentinel import Sentinel from redis.lock import Lock -from redis._compat import nativestr +from redis.utils import str_if_bytes from redis import exceptions as redis_exceptions from ricsdl.configuration import _Configuration from ricsdl.exceptions import ( @@ -69,7 +69,7 @@ class PubSub(redis.client.PubSub): Adapted from: https://github.com/andymccurdy/redis-py/blob/master/redis/client.py """ - message_type = nativestr(response[0]) + message_type = str_if_bytes(response[0]) if message_type == 'pmessage': message = { 'type': message_type, @@ -392,7 +392,7 @@ class RedisBackend(DbBackendAbc): new_sentinel = Sentinel([sentinel_node]) new_redis = new_sentinel.master_for(master_name) - new_redis.set_response_callback('SETIE', lambda r: r and nativestr(r) == 'OK' or False) + new_redis.set_response_callback('SETIE', lambda r: r and str_if_bytes(r) == 'OK' or False) new_redis.set_response_callback('DELIE', lambda r: r and int(r) == 1 or False) redis_pubsub = PubSub(self.event_separator, new_redis.connection_pool, ignore_subscribe_messages=True)