Skip to content

Commit 42bb8f5

Browse files
committed
Simplify code.
1 parent 615f0f9 commit 42bb8f5

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

redis/asyncio/connection.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ def on_disconnect(self):
234234
if self._stream is not None:
235235
self._stream = None
236236
self.encoder = None
237+
self._clear()
237238

238239
async def can_read_destructive(self) -> bool:
239240
if self._buffer:
@@ -247,23 +248,15 @@ async def can_read_destructive(self) -> bool:
247248
return False
248249

249250
async def read_response(self, disable_decoding: bool = False):
250-
if self._stream is None:
251-
raise RedisError("Buffer is closed.")
252251
if self._chunks:
253252
# augment parsing buffer with previously read data
254253
self._buffer += b"".join(self._chunks)
255254
self._chunks.clear()
256-
try:
257-
self._pos = 0
258-
response = await self._read_response(disable_decoding=disable_decoding)
259-
except (ConnectionError, InvalidResponse):
260-
# We don't want these errors to be resumable
261-
self._clear()
262-
raise
263-
else:
264-
# Successfully parsing a response allows us to clear our parsing buffer
265-
self._clear()
266-
return response
255+
self._pos = 0
256+
response = await self._read_response(disable_decoding=disable_decoding)
257+
# Successfully parsing a response allows us to clear our parsing buffer
258+
self._clear()
259+
return response
267260

268261
async def _read_response(
269262
self, disable_decoding: bool = False

0 commit comments

Comments
 (0)