Skip to content

Commit e46dd85

Browse files
authored
Added boolean parsing to PEXPIRE and PEXPIREAT (#1665)
1 parent 8178997 commit e46dd85

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

redis/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,8 @@ class Redis(RedisModuleCommands, CoreCommands, object):
618618
"""
619619
RESPONSE_CALLBACKS = {
620620
**string_keys_to_dict(
621-
'AUTH COPY EXPIRE EXPIREAT HEXISTS HMSET LMOVE BLMOVE MOVE '
621+
'AUTH COPY EXPIRE EXPIREAT PEXPIRE PEXPIREAT '
622+
'HEXISTS HMSET LMOVE BLMOVE MOVE '
622623
'MSETNX PERSIST PSETEX RENAMENX SISMEMBER SMOVE SETEX SETNX',
623624
bool
624625
),

tests/test_commands.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -834,28 +834,28 @@ def test_exists_contains(self, r):
834834
assert 'a' in r
835835

836836
def test_expire(self, r):
837-
assert not r.expire('a', 10)
837+
assert r.expire('a', 10) is False
838838
r['a'] = 'foo'
839-
assert r.expire('a', 10)
839+
assert r.expire('a', 10) is True
840840
assert 0 < r.ttl('a') <= 10
841841
assert r.persist('a')
842842
assert r.ttl('a') == -1
843843

844844
def test_expireat_datetime(self, r):
845845
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
846846
r['a'] = 'foo'
847-
assert r.expireat('a', expire_at)
847+
assert r.expireat('a', expire_at) is True
848848
assert 0 < r.ttl('a') <= 61
849849

850850
def test_expireat_no_key(self, r):
851851
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
852-
assert not r.expireat('a', expire_at)
852+
assert r.expireat('a', expire_at) is False
853853

854854
def test_expireat_unixtime(self, r):
855855
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
856856
r['a'] = 'foo'
857857
expire_at_seconds = int(time.mktime(expire_at.timetuple()))
858-
assert r.expireat('a', expire_at_seconds)
858+
assert r.expireat('a', expire_at_seconds) is True
859859
assert 0 < r.ttl('a') <= 61
860860

861861
def test_get_and_set(self, r):
@@ -998,9 +998,9 @@ def test_msetnx(self, r):
998998

999999
@skip_if_server_version_lt('2.6.0')
10001000
def test_pexpire(self, r):
1001-
assert not r.pexpire('a', 60000)
1001+
assert r.pexpire('a', 60000) is False
10021002
r['a'] = 'foo'
1003-
assert r.pexpire('a', 60000)
1003+
assert r.pexpire('a', 60000) is True
10041004
assert 0 < r.pttl('a') <= 60000
10051005
assert r.persist('a')
10061006
assert r.pttl('a') == -1
@@ -1009,20 +1009,20 @@ def test_pexpire(self, r):
10091009
def test_pexpireat_datetime(self, r):
10101010
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
10111011
r['a'] = 'foo'
1012-
assert r.pexpireat('a', expire_at)
1012+
assert r.pexpireat('a', expire_at) is True
10131013
assert 0 < r.pttl('a') <= 61000
10141014

10151015
@skip_if_server_version_lt('2.6.0')
10161016
def test_pexpireat_no_key(self, r):
10171017
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
1018-
assert not r.pexpireat('a', expire_at)
1018+
assert r.pexpireat('a', expire_at) is False
10191019

10201020
@skip_if_server_version_lt('2.6.0')
10211021
def test_pexpireat_unixtime(self, r):
10221022
expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)
10231023
r['a'] = 'foo'
10241024
expire_at_seconds = int(time.mktime(expire_at.timetuple())) * 1000
1025-
assert r.pexpireat('a', expire_at_seconds)
1025+
assert r.pexpireat('a', expire_at_seconds) is True
10261026
assert 0 < r.pttl('a') <= 61000
10271027

10281028
@skip_if_server_version_lt('2.6.0')
@@ -1040,9 +1040,9 @@ def test_psetex_timedelta(self, r):
10401040

10411041
@skip_if_server_version_lt('2.6.0')
10421042
def test_pttl(self, r):
1043-
assert not r.pexpire('a', 10000)
1043+
assert r.pexpire('a', 10000) is False
10441044
r['a'] = '1'
1045-
assert r.pexpire('a', 10000)
1045+
assert r.pexpire('a', 10000) is True
10461046
assert 0 < r.pttl('a') <= 10000
10471047
assert r.persist('a')
10481048
assert r.pttl('a') == -1

0 commit comments

Comments
 (0)