Fix for DEFAULT_TIMEOUT for pexpire, unwanted comments removed and te…

…scases & changelog updated

changelog.d/724.bugfix

@@ -1,3 +1 @@
-Fix for Issue 724(expire method fails when using DEFAULT_TIMEOUT)
-
-https://github.com/jazzband/django-redis/issues/724
+Hotfix for timeout=DEFAULT_TIMEOUT in expire and pexpire

django_redis/client/default.py

@@ -299,12 +299,6 @@ def expire(
         version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> bool:
-        # timeout could be of type int|timedelta
-        # if timeout is DEFAULT_TIMEOUT or None then
-        # use self._backend.default_timeout(django default cache timeout)
-
-        # for some strange reason mypy complains,
-        # saying that timeout type is float | timedelta
         if (timeout is DEFAULT_TIMEOUT) or (timeout is None):
             timeout = self._backend.default_timeout  # type: ignore
 
@@ -324,6 +318,9 @@ def pexpire(
         version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> bool:
+        if (timeout is DEFAULT_TIMEOUT) or (timeout is None):
+            timeout = self._backend.default_timeout  # type: ignore
+
         if client is None:
             client = self.get_client(write=True)
 

tests/test_backend.py

@@ -610,6 +610,7 @@ def test_expire(self, cache: RedisCache):
     def test_expire_with_default_timeout(self, cache: RedisCache):
         cache.set("foo", "bar", timeout=None)
         assert cache.expire("foo", DEFAULT_TIMEOUT) is True
+        assert cache.expire("not-existent-key", DEFAULT_TIMEOUT) is False
 
     def test_pexpire(self, cache: RedisCache):
         cache.set("foo", "bar", timeout=None)
@@ -619,6 +620,11 @@ def test_pexpire(self, cache: RedisCache):
         assert pytest.approx(ttl, 10) == 20500
         assert cache.pexpire("not-existent-key", 20500) is False
 
+    def test_pexpire_with_default_timeout(self, cache: RedisCache):
+        cache.set("foo", "bar", timeout=None)
+        assert cache.pexpire("foo", DEFAULT_TIMEOUT) is True
+        assert cache.pexpire("not-existent-key", DEFAULT_TIMEOUT) is False
+
     def test_pexpire_at(self, cache: RedisCache):
         # Test settings expiration time 1 hour ahead by datetime.
         cache.set("foo", "bar", timeout=None)