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"
@@ -905,7 +891,12 @@ async def read_response(
         """Read the response from a previously sent command"""
         read_timeout = timeout if timeout is not None else self.socket_timeout
         try:
-            async with async_timeout.timeout(read_timeout):
+            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
                 )