don't use can_read in pubsub

Author: kristjanvalur

redis/asyncio/client.py

@@ -24,6 +24,8 @@
     cast,
 )
 
+import async_timeout
+
 from redis.asyncio.connection import (
     Connection,
     ConnectionPool,
@@ -755,12 +757,16 @@ async def parse_response(self, block: bool = True, timeout: float = 0):
         await self.check_health()
 
         async def try_read():
+            if not conn.is_connected:
+                await conn.connect()
             if not block:
-                if not await conn.can_read(timeout=timeout):
+                try:
+                    async with async_timeout.timeout(timeout):
+                        return await conn.read_response()
+                except asyncio.TimeoutError:
                     return None
             else:
-                await conn.connect()
-            return await conn.read_response()
+                return await conn.read_response()
 
         response = await self._execute(conn, try_read)
 

redis/asyncio/connection.py

@@ -941,6 +941,10 @@ async def read_response(self, disable_decoding: bool = False):
             raise ConnectionError(
                 f"Error while reading from {self.host}:{self.port} : {e.args}"
             )
+        except asyncio.CancelledError:
+            # need this check for 3.7, where CancelledError
+            # is subclass of Exception, not BaseException
+            raise
         except Exception:
             await self.disconnect()
             raise