Fix Python 3.11 error

aio-libs-abandoned · Feb 6, 2023 · 1b95150 · 1b95150
1 parent 19be499
commit 1b95150
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES/1490.bugfix b/CHANGES/1490.bugfix
@@ -0,0 +1 @@
+aioredis.TimeoutError inherits only builtins.TimeoutError when Python asyncio.TimeoutError == builtins.TimeoutError.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -37,6 +37,7 @@ Ivan Antonyuck
 James Hilliard
 Jan Špaček
 Jeff Moser
+Jeong, YunWon <youknowone>
 Joongi Kim <achimnol>
 Kyrylo Dehtyarenko
 Leonid Shvechikov

diff --git a/aioredis/exceptions.py b/aioredis/exceptions.py
@@ -10,9 +10,12 @@ class RedisError(Exception):
 class ConnectionError(RedisError):
     pass
 
-
-class TimeoutError(asyncio.TimeoutError, builtins.TimeoutError, RedisError):
-    pass
+if asyncio.TimeoutError is builtins.TimeoutError:  # >= Python 3.11
+    class TimeoutError(builtins.TimeoutError, RedisError):
+        pass
+else:
+    class TimeoutError(asyncio.TimeoutError, builtins.TimeoutError, RedisError):
+        pass
 
 
 class AuthenticationError(ConnectionError):