Exclude tuple subclasses

Author: cdce8p

pylint/checkers/match_statements_checker.py

@@ -20,21 +20,19 @@
 
 
 # List of builtin classes which match self
-# Exclude `dict`, `list` and `tuple` as those could also
-# be matched by the mapping or sequence patterns.
 # https://docs.python.org/3/reference/compound_stmts.html#class-patterns
 MATCH_CLASS_SELF_NAMES = {
     "builtins.bool",
     "builtins.bytearray",
     "builtins.bytes",
-    # "builtins.dict",
+    "builtins.dict",
     "builtins.float",
     "builtins.frozenset",
     "builtins.int",
-    # "builtins.list",
+    "builtins.list",
     "builtins.set",
     "builtins.str",
-    # "builtins.tuple",
+    "builtins.tuple",
 }
 
 
@@ -191,7 +189,10 @@ def visit_matchclass(self, node: nodes.MatchClass) -> None:
                 inferred = safe_infer(node.cls)
                 if not (
                     isinstance(inferred, nodes.ClassDef)
-                    and inferred.qname() in MATCH_CLASS_SELF_NAMES
+                    and (
+                        inferred.qname() in MATCH_CLASS_SELF_NAMES
+                        or "tuple" in inferred.basenames
+                    )
                 ):
                     self.add_message(
                         "match-class-positional-attributes",

tests/functional/m/match_class_pattern.py

@@ -37,7 +37,7 @@ def f1(x):
         case int(1): ...
         case int(1, 2): ...  # [too-many-positional-sub-patterns]
         case tuple(1): ...
-        case tuple(1, 2): ...
+        case tuple(1, 2): ...  # [too-many-positional-sub-patterns]
         case tuple((1, 2)): ...
         case Result(1, 2): ...
 
@@ -74,5 +74,5 @@ def f4(x):
         case A(x=1): ...
         case B(1, 2): ...  # [match-class-positional-attributes]
         case B(x=1, y=2): ...
-        case Result(1, 2): ...  # [match-class-positional-attributes]
+        case Result(1, 2): ...
         case Result(x=1, y=2): ...

tests/functional/m/match_class_pattern.txt

@@ -3,11 +3,11 @@ invalid-match-args-definition:17:21:17:29:D:`__match_args__` must be a tuple of
 too-many-positional-sub-patterns:34:13:34:20:f1:A expects 1 positional sub-patterns (given 2):INFERENCE
 too-many-positional-sub-patterns:36:13:36:23:f1:B expects 2 positional sub-patterns (given 3):INFERENCE
 too-many-positional-sub-patterns:38:13:38:22:f1:int expects 1 positional sub-patterns (given 2):INFERENCE
+too-many-positional-sub-patterns:40:13:40:24:f1:tuple expects 1 positional sub-patterns (given 2):INFERENCE
 multiple-class-sub-patterns:47:13:47:22:f2:Multiple sub-patterns for attribute x:INFERENCE
 multiple-class-sub-patterns:49:13:49:29:f2:Multiple sub-patterns for attribute x:INFERENCE
 undefined-variable:55:13:55:23:f2:Undefined variable 'NotDefined':UNDEFINED
 match-class-bind-self:60:17:60:18:f3:Use 'int() as y' instead:HIGH
 match-class-bind-self:63:17:63:18:f3:Use 'str() as y' instead:HIGH
 match-class-positional-attributes:73:13:73:17:f4:Use keyword attributes instead of positional ones:HIGH
 match-class-positional-attributes:75:13:75:20:f4:Use keyword attributes instead of positional ones:HIGH
-match-class-positional-attributes:77:13:77:25:f4:Use keyword attributes instead of positional ones:HIGH