From 4ed8aba8441ae841e2c8e698b84ebda1da8208f9 Mon Sep 17 00:00:00 2001 From: joe <32424163+joekohlsdorf@users.noreply.github.com> Date: Tue, 2 Aug 2022 06:53:50 -0400 Subject: Fix timezone handling for datetime to unixtime conversions (#2213) * Fix timezone handling for datetime to unixtime conversions datetime objects are supported to set expire, these can have timezones. mktime was used to convert these to unixtime. mktime in Python however is not timezone aware, it expects the input to be UTC and redis-py did not convert the datetime timestamps to UTC before calling mktime. This can lead to: 1) Setting incorrect expire times because the input datetime object has a timezone but is passed to mktime without converting to UTC first. 2) When the datetime timestamp is within DST, mktime fails with "OverflowError: mktime argument out of range" because UTC doesn't have DST. This depends on libc versions. * linters Co-authored-by: dvora-h <67596500+dvora-h@users.noreply.github.com> --- tests/test_commands.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/test_commands.py') diff --git a/tests/test_commands.py b/tests/test_commands.py index 715d18c..f9134d8 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -1185,7 +1185,7 @@ class TestRedisCommands: def test_expireat_unixtime(self, r): expire_at = redis_server_time(r) + datetime.timedelta(minutes=1) r["a"] = "foo" - expire_at_seconds = int(time.mktime(expire_at.timetuple())) + expire_at_seconds = int(expire_at.timestamp()) assert r.expireat("a", expire_at_seconds) is True assert 0 < r.ttl("a") <= 61 @@ -1428,8 +1428,8 @@ class TestRedisCommands: def test_pexpireat_unixtime(self, r): expire_at = redis_server_time(r) + datetime.timedelta(minutes=1) r["a"] = "foo" - expire_at_seconds = int(time.mktime(expire_at.timetuple())) * 1000 - assert r.pexpireat("a", expire_at_seconds) is True + expire_at_milliseconds = int(expire_at.timestamp() * 1000) + assert r.pexpireat("a", expire_at_milliseconds) is True assert 0 < r.pttl("a") <= 61000 @skip_if_server_version_lt("7.0.0") -- cgit v1.2.1