expand with statement to avoid invoking null context managers.

remove nullcontext

Author: kristjanvalur

redis/asyncio/connection.py

@@ -1,5 +1,4 @@
 import asyncio
-import contextlib
 import copy
 import enum
 import inspect
@@ -55,19 +54,6 @@
 if HIREDIS_AVAILABLE:
     import hiredis
 
-if sys.version_info[:2] >= (3, 10):
-    nullcontext = contextlib.nullcontext()
-else:
-
-    class NullContext:
-        async def __aenter__(self):
-            pass
-
-        async def __aexit__(self, *args):
-            pass
-
-    nullcontext = NullContext()
-
 SYM_STAR = b"*"
 SYM_DOLLAR = b"$"
 SYM_CRLF = b"\r\n"
@@ -906,12 +892,28 @@ async def read_response(
     ):
         """Read the response from a previously sent command"""
         read_timeout = timeout if timeout is not None else self.socket_timeout
-        lock_ctxt = self._lock if with_lock else nullcontext
         try:
-            async with lock_ctxt, async_timeout.timeout(read_timeout):
-                response = await self._parser.read_response(
-                    disable_decoding=disable_decoding
-                )
+            if with_lock:
+                if read_timeout is not None:
+                    async with self._lock, async_timeout.timeout(read_timeout):
+                        response = await self._parser.read_response(
+                            disable_decoding=disable_decoding
+                        )
+                else:
+                    async with self._lock:
+                        response = await self._parser.read_response(
+                            disable_decoding=disable_decoding
+                        )
+            else:
+                if read_timeout is not None:
+                    async with async_timeout.timeout(read_timeout):
+                        response = await self._parser.read_response(
+                            disable_decoding=disable_decoding
+                        )
+                else:
+                    response = await self._parser.read_response(
+                        disable_decoding=disable_decoding
+                    )
         except asyncio.TimeoutError:
             if timeout is not None:
                 # user requested timeout, return None