Moved ClusterParser exceptions to BaseParser class

Author: vladvildanov

docs/clustering.rst

@@ -17,8 +17,8 @@ Nodes <#specifying-target-nodes>`__ \| `Multi-key
 Commands <#multi-key-commands>`__ \| `Known PubSub
 Limitations <#known-pubsub-limitations>`__
 
-Creating clusters
------------------
+Connecting to cluster
+---------------------
 
 Connecting redis-py to a Redis Cluster instance(s) requires at a minimum
 a single node for cluster discovery. There are multiple ways in which a

redis/_parsers/base.py

@@ -20,7 +20,7 @@
     OutOfMemoryError,
     ReadOnlyError,
     RedisError,
-    ResponseError,
+    ResponseError, AskError, TryAgainError, MovedError, ClusterDownError, ClusterCrossSlotError, MasterDownError,
 )
 from ..typing import EncodableT
 from .encoders import Encoder
@@ -72,6 +72,12 @@ class BaseParser(ABC):
         "READONLY": ReadOnlyError,
         "NOAUTH": AuthenticationError,
         "NOPERM": NoPermissionError,
+        "ASK": AskError,
+        "TRYAGAIN": TryAgainError,
+        "MOVED": MovedError,
+        "CLUSTERDOWN": ClusterDownError,
+        "CROSSSLOT": ClusterCrossSlotError,
+        "MASTERDOWN": MasterDownError,
     }
 
     @classmethod

redis/asyncio/cluster.py

@@ -79,20 +79,6 @@
 )
 
 
-class ClusterParser(DefaultParser):
-    EXCEPTION_CLASSES = dict_merge(
-        DefaultParser.EXCEPTION_CLASSES,
-        {
-            "ASK": AskError,
-            "CLUSTERDOWN": ClusterDownError,
-            "CROSSSLOT": ClusterCrossSlotError,
-            "MASTERDOWN": MasterDownError,
-            "MOVED": MovedError,
-            "TRYAGAIN": TryAgainError,
-        },
-    )
-
-
 class RedisCluster(AbstractRedis, AbstractRedisCluster, AsyncRedisClusterCommands):
     """
     Create a new RedisCluster client.
@@ -297,7 +283,6 @@ def __init__(
         kwargs: Dict[str, Any] = {
             "max_connections": max_connections,
             "connection_class": Connection,
-            "parser_class": ClusterParser,
             # Client related kwargs
             "credential_provider": credential_provider,
             "username": username,

redis/cluster.py

@@ -193,20 +193,6 @@ def cleanup_kwargs(**kwargs):
     return connection_kwargs
 
 
-class ClusterParser(DefaultParser):
-    EXCEPTION_CLASSES = dict_merge(
-        DefaultParser.EXCEPTION_CLASSES,
-        {
-            "ASK": AskError,
-            "TRYAGAIN": TryAgainError,
-            "MOVED": MovedError,
-            "CLUSTERDOWN": ClusterDownError,
-            "CROSSSLOT": ClusterCrossSlotError,
-            "MASTERDOWN": MasterDownError,
-        },
-    )
-
-
 class AbstractRedisCluster:
     RedisClusterRequestTTL = 16
 
@@ -692,7 +678,6 @@ def on_connect(self, connection):
         Initialize the connection, authenticate and select a database and send
          READONLY if it is set during object initialization.
         """
-        connection.set_parser(ClusterParser)
         connection.on_connect()
 
         if self.read_from_replicas: