diff options
author | Andy McCurdy <andy@andymccurdy.com> | 2019-05-26 16:26:07 -0700 |
---|---|---|
committer | Andy McCurdy <andy@andymccurdy.com> | 2019-05-26 16:26:07 -0700 |
commit | 6b98c72ad9ca33befbe0e9d7f2d47623981ebed3 (patch) | |
tree | 5f91b1438bdf8529095f32f6cf4d6a884a27d15c | |
parent | 69be5294110fcf2d9cee24ca71705c639b43f643 (diff) | |
parent | cdfe2befbe00db4a3c48c9ddd6d64dea15f6f0db (diff) | |
download | redis-py-6b98c72ad9ca33befbe0e9d7f2d47623981ebed3.tar.gz |
Merge branch 'master' into monitor
-rwxr-xr-x | redis/client.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/redis/client.py b/redis/client.py index 07df19a..0b9863f 100755 --- a/redis/client.py +++ b/redis/client.py @@ -276,9 +276,11 @@ def parse_xclaim(response, **options): def parse_xinfo_stream(response): data = pairs_to_dict(response, decode_keys=True) first = data['first-entry'] - data['first-entry'] = (first[0], pairs_to_dict(first[1])) + if first is not None: + data['first-entry'] = (first[0], pairs_to_dict(first[1])) last = data['last-entry'] - data['last-entry'] = (last[0], pairs_to_dict(last[1])) + if last is not None: + data['last-entry'] = (last[0], pairs_to_dict(last[1])) return data |