Skip to content
This repository has been archived by the owner on Feb 21, 2023. It is now read-only.

Remove __del__ from Redis (Fixes #1115) #1227

Merged
merged 6 commits into from Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/1227.bugfix
@@ -0,0 +1 @@
Change `__del__` in Redis to raise ResourceWarning (Fixes #1115)
34 changes: 17 additions & 17 deletions aioredis/client.py
Expand Up @@ -1054,14 +1054,23 @@ async def __aenter__(self: _RedisT) -> _RedisT:
async def __aexit__(self, exc_type, exc_value, traceback):
await self.close()

def __del__(self):
_DEL_MESSAGE = "Unclosed Redis client"

def __del__(self, _warnings: Any = warnings) -> None:
try:
loop = asyncio.get_event_loop()
if loop.is_running():
loop.create_task(self.close())
else:
loop.run_until_complete(self.close())
except Exception:
if self.connection is not None:
_warnings.warn(
f"Unclosed client session {self!r}",
ResourceWarning,
source=self,
)
context = {"client": self, "message": self._DEL_MESSAGE}
if self._source_traceback is not None:
context["source_traceback"] = self._source_traceback
self._loop.call_exception_handler(context)
Andrew-Chen-Wang marked this conversation as resolved.
Show resolved Hide resolved
except AttributeError:
# loop was not initialized yet,
# either self._connector or self._loop doesn't exist
Andrew-Chen-Wang marked this conversation as resolved.
Show resolved Hide resolved
pass

async def close(self):
Expand Down Expand Up @@ -4349,16 +4358,7 @@ async def __aexit__(self, exc_type, exc_value, traceback):
def __await__(self):
return self._async_self().__await__()

def __del__(self):
try:
loop = asyncio.get_event_loop()
if loop.is_running():
loop.create_task(self.reset())
else:
loop.run_until_complete(self.reset())
super().__del__()
except Exception:
pass
_DEL_MESSAGE = "Unclosed Pipeline client"

def __len__(self):
return len(self.command_stack)
Expand Down