From 142e677fd84a70bb10d20f51750b641049a0d9b5 Mon Sep 17 00:00:00 2001
From: jonathan vanasco <jonathan@2xlp.com>
Date: Sat, 2 Aug 2025 10:42:43 -0400
Subject: [PATCH] blocking_timeout should default to self.timeout

---
 redis/lock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redis/lock.py b/redis/lock.py
index 0288496e6f..b2dd0c2f84 100644
--- a/redis/lock.py
+++ b/redis/lock.py
@@ -219,7 +219,7 @@ def acquire(
         if blocking is None:
             blocking = self.blocking
         if blocking_timeout is None:
-            blocking_timeout = self.blocking_timeout
+            blocking_timeout = self.blocking_timeout or self.timeout
         stop_trying_at = None
         if blocking_timeout is not None:
             stop_trying_at = mod_time.monotonic() + blocking_timeout