From c2c1ff588de7e5286d9fbbef6aae96d52aaa983c Mon Sep 17 00:00:00 2001 From: farahats9 Date: Wed, 2 Nov 2022 18:31:33 +0200 Subject: [PATCH 1/4] remove redundant TimeoutError class --- aioredis/exceptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aioredis/exceptions.py b/aioredis/exceptions.py index e4c2ed1e4..588c16ced 100644 --- a/aioredis/exceptions.py +++ b/aioredis/exceptions.py @@ -11,7 +11,7 @@ class ConnectionError(RedisError): pass -class TimeoutError(asyncio.TimeoutError, builtins.TimeoutError, RedisError): +class TimeoutError(asyncio.TimeoutError, RedisError): pass From 5feb59e6dfca92a189e3d85809b2e6c2291a7066 Mon Sep 17 00:00:00 2001 From: farahats9 Date: Wed, 2 Nov 2022 18:38:13 +0200 Subject: [PATCH 2/4] Added myself to contributors --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 36953225a..4cf73d3dd 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -48,6 +48,7 @@ Martin Maxim Dodonchuk Michael Käufl Mikhail Solomenik +Mohamed Farahat Nickolai Novik Oleg Abramov Oleg Butuzov From 3ad900b3a61333c4877ceb658b39c46ed0f8e776 Mon Sep 17 00:00:00 2001 From: farahats9 Date: Wed, 2 Nov 2022 18:40:55 +0200 Subject: [PATCH 3/4] Added news fragment --- CHANGES/1443.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/1443.bugfix diff --git a/CHANGES/1443.bugfix b/CHANGES/1443.bugfix new file mode 100644 index 000000000..c7c9cdc1e --- /dev/null +++ b/CHANGES/1443.bugfix @@ -0,0 +1 @@ +Remove the `builtins.TimeoutError` class from base classes of `aioredis.exceptions.TimeoutError` because it is causing an error due to its redundancy. From e367bfb86a11e18621396d264ca424e3d56ad761 Mon Sep 17 00:00:00 2001 From: farahats9 Date: Wed, 2 Nov 2022 18:59:06 +0200 Subject: [PATCH 4/4] remove redundant import --- aioredis/exceptions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/aioredis/exceptions.py b/aioredis/exceptions.py index 588c16ced..7c5cccfbb 100644 --- a/aioredis/exceptions.py +++ b/aioredis/exceptions.py @@ -1,6 +1,5 @@ """Core exceptions raised by the Redis client""" import asyncio -import builtins class RedisError(Exception):