Improve match self detection

Author: cdce8p

pylint/checkers/match_statements_checker.py

@@ -20,19 +20,21 @@
 
 
 # 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",
 }
 
 

tests/functional/m/match_class_pattern.py

@@ -1,6 +1,8 @@
 # pylint: disable=missing-docstring,unused-variable,too-few-public-methods
 # pylint: disable=match-class-positional-attributes
 
+from typing import NamedTuple
+
 # -- Check __match_args__ definitions --
 class A:
     __match_args__ = ("x",)
@@ -19,6 +21,12 @@ def f(self):
         __match_args__ = ["x"]
 
 
+class Result(NamedTuple):
+    # inherits from tuple -> match self
+    x: int
+    y: int
+
+
 def f1(x):
     """Check too many positional sub-patterns"""
     match x:
@@ -28,6 +36,10 @@ def f1(x):
         case B(1, 2, 3): ...  # [too-many-positional-sub-patterns]
         case int(1): ...
         case int(1, 2): ...  # [too-many-positional-sub-patterns]
+        case tuple(1): ...
+        case tuple(1, 2): ...
+        case tuple((1, 2)): ...
+        case Result(1, 2): ...
 
 def f2(x):
     """Check multiple sub-patterns for attribute"""
@@ -51,8 +63,6 @@ def f3(x):
         case str(y): ...   # [match-class-bind-self]
         case str() as y: ...
         case str("Hello" as y): ...
-        case tuple(y): ...  # [match-class-bind-self]
-        case tuple() as y: ...
 
 def f4(x):
     """Check for positional attributes if keywords could be used."""
@@ -64,3 +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(x=1, y=2): ...

tests/functional/m/match_class_pattern.txt

@@ -1,13 +1,13 @@
-invalid-match-args-definition:12:21:12:31:C:`__match_args__` must be a tuple of strings.:HIGH
-invalid-match-args-definition:15:21:15:29:D:`__match_args__` must be a tuple of strings.:HIGH
-too-many-positional-sub-patterns:26:13:26:20:f1:A expects 1 positional sub-patterns (given 2):INFERENCE
-too-many-positional-sub-patterns:28:13:28:23:f1:B expects 2 positional sub-patterns (given 3):INFERENCE
-too-many-positional-sub-patterns:30:13:30:22:f1:int expects 1 positional sub-patterns (given 2):INFERENCE
-multiple-class-sub-patterns:35:13:35:22:f2:Multiple sub-patterns for attribute x:INFERENCE
-multiple-class-sub-patterns:37:13:37:29:f2:Multiple sub-patterns for attribute x:INFERENCE
-undefined-variable:43:13:43:23:f2:Undefined variable 'NotDefined':UNDEFINED
-match-class-bind-self:48:17:48:18:f3:Use 'int() as y' instead:HIGH
-match-class-bind-self:51:17:51:18:f3:Use 'str() as y' instead:HIGH
-match-class-bind-self:54:19:54:20:f3:Use 'tuple() as y' instead:HIGH
-match-class-positional-attributes:63:13:63:17:f4:Use keyword attributes instead of positional ones:HIGH
-match-class-positional-attributes:65:13:65:20:f4:Use keyword attributes instead of positional ones:HIGH
+invalid-match-args-definition:14:21:14:31:C:`__match_args__` must be a tuple of strings.:HIGH
+invalid-match-args-definition:17:21:17:29:D:`__match_args__` must be a tuple of strings.:HIGH
+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
+multiple-class-sub-patterns:48:13:48:22:f2:Multiple sub-patterns for attribute x:INFERENCE
+multiple-class-sub-patterns:50:13:50:29:f2:Multiple sub-patterns for attribute x:INFERENCE
+undefined-variable:56:13:56:23:f2:Undefined variable 'NotDefined':UNDEFINED
+match-class-bind-self:61:17:61:18:f3:Use 'int() as y' instead:HIGH
+match-class-bind-self:64:17:64:18:f3:Use 'str() as y' instead:HIGH
+match-class-positional-attributes:74:13:74:17:f4:Use keyword attributes instead of positional ones:HIGH
+match-class-positional-attributes:76:13:76:20:f4:Use keyword attributes instead of positional ones:HIGH
+match-class-positional-attributes:78:13:78:25:f4:Use keyword attributes instead of positional ones:HIGH