Replace OSError exceptions from can_read with redis.ConnectionError (#2140)

* Replace OSError exceptions from `can_read` with `redis.ConnectionError` * Fix formatting * Revert unintended formatting change

Author: kristjanvalur

redis/asyncio/connection.py

@@ -911,7 +911,13 @@ async def can_read(self, timeout: float = 0):
  """Poll the socket to see if there's data that can be read."""
  if not self.is_connected:
  await self.connect()
- return await self._parser.can_read(timeout)
+ try:
+ return await self._parser.can_read(timeout)
+ except OSError as e:
+ await self.disconnect()
+ raise ConnectionError(
+ f"Error while reading from {self.host}:{self.port}: {e.args}"
+ )
 
  async def read_response(self, disable_decoding: bool = False):
  """Read the response from a previously sent command"""

redis/connection.py

@@ -808,7 +808,13 @@ def can_read(self, timeout=0):
  sock = self._sock
  if not sock:
  self.connect()
- return self._parser.can_read(timeout)
+ try:
+ return self._parser.can_read(timeout)
+ except OSError as e:
+ self.disconnect()
+ raise ConnectionError(
+ f"Error while reading from {self.host}:{self.port}: {e.args}"
+ )
 
  def read_response(self, disable_decoding=False):
  """Read the response from a previously sent command"""