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. 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 diff --git a/aioredis/exceptions.py b/aioredis/exceptions.py index e4c2ed1e4..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): @@ -11,7 +10,7 @@ class ConnectionError(RedisError): pass -class TimeoutError(asyncio.TimeoutError, builtins.TimeoutError, RedisError): +class TimeoutError(asyncio.TimeoutError, RedisError): pass