add variables to the function header

Author: dvora-h

redis/commands/core.py

@@ -1496,9 +1496,10 @@ def expire(
         self,
         name: KeyT,
         time: ExpiryT,
-        option: Union[
-            Literal["NX"], Literal["XX"], Literal["GT"], Literal["LT"]
-        ] = None,
+        nx: bool = False,
+        xx: bool = False,
+        gt: bool = False,
+        lt: bool = False,
     ) -> ResponseT:
         """
         Set an expire flag on key ``name`` for ``time`` seconds with given
@@ -1516,13 +1517,15 @@ def expire(
         if isinstance(time, datetime.timedelta):
             time = int(time.total_seconds())
 
-        options = ["NX", "XX", "GT", "LT"]
-        if option and option not in options:
-            raise DataError(f"OPTION must be one of {options}")
-
         exp_option = list()
-        if option is not None:
-            exp_option.append(option)
+        if nx:
+            exp_option.append("NX")
+        if xx:
+            exp_option.append("XX")
+        if gt:
+            exp_option.append("GT")
+        if lt:
+            exp_option.append("LT")
 
         return self.execute_command("EXPIRE", name, time, *exp_option)
 

tests/test_commands.py

@@ -1061,27 +1061,27 @@ def test_expire(self, r):
     @skip_if_server_version_lt("7.0.0")
     def test_expire_option_nx(self, r):
         r.set("key", "val")
-        assert r.expire("key", 100, "NX") == 1
-        assert r.expire("key", 500, "NX") == 0
+        assert r.expire("key", 100, nx=True) == 1
+        assert r.expire("key", 500, nx=True) == 0
 
     @skip_if_server_version_lt("7.0.0")
     def test_expire_option_xx(self, r):
         r.set("key", "val")
-        assert r.expire("key", 100, "XX") == 0
+        assert r.expire("key", 100, xx=True) == 0
         assert r.expire("key", 100)
-        assert r.expire("key", 500, "XX") == 1
+        assert r.expire("key", 500, nx=True) == 1
 
     @skip_if_server_version_lt("7.0.0")
     def test_expire_option_gt(self, r):
         r.set("key", "val", 100)
-        assert r.expire("key", 50, "GT") == 0
-        assert r.expire("key", 500, "GT") == 1
+        assert r.expire("key", 50, gt=True) == 0
+        assert r.expire("key", 500, gt=True) == 1
 
     @skip_if_server_version_lt("7.0.0")
     def test_expire_option_lt(self, r):
         r.set("key", "val", 100)
-        assert r.expire("key", 50, "LT") == 1
-        assert r.expire("key", 150, "LT") == 0
+        assert r.expire("key", 50, lt=True) == 1
+        assert r.expire("key", 150, lt=True) == 0
 
     def test_expireat_datetime(self, r):
         expire_at = redis_server_time(r) + datetime.timedelta(minutes=1)