[Backport maintenance/4.0.x] Allow digits in ParamSpec and TypeVarTuple names for invalid-name check (#11095)

Allow digits in ParamSpec and TypeVarTuple names for invalid-name check (#11091)

The default paramspec-rgx and typevartuple-rgx patterns rejected names
containing digits (e.g. Ec2P, S3Ts), emitting a false invalid-name
(C0103). Allow digits in the lowercase segments of both patterns,
consistent with the typevar fix from #11078.

Closes #11090

(cherry picked from commit fe87ce2)

Co-authored-by: Karl Hill <karlhillx@gmail.com>

Author: pylint-backport[bot]

doc/whatsnew/fragments/11090.bugfix

@@ -0,0 +1,8 @@
+Allow digits in ParamSpec and TypeVarTuple names for `invalid-name` check.
+
+The default `paramspec-rgx` and `typevartuple-rgx` patterns rejected names
+containing digits (e.g. ``Ec2P``, ``S3Ts``), emitting a false ``invalid-name``
+(C0103). Allow digits in the lowercase segments, consistent with the
+``typevar`` and ``typealias`` patterns.
+
+Closes #11090

pylint/checkers/base/name_checker/checker.py

@@ -42,8 +42,10 @@
     "typevar": re.compile(
         r"^_{0,2}(?!T[A-Z])(?:[A-Z]+|(?:[A-Z]+[a-z0-9]+)+(?:T)?(?<!Type))(?:_co(?:ntra)?)?$"
     ),
-    "paramspec": re.compile(r"^_{0,2}(?:[A-Z]+|(?:[A-Z]+[a-z]+)+(?:P)?(?<!Type))$"),
-    "typevartuple": re.compile(r"^_{0,2}(?:[A-Z]+|(?:[A-Z]+[a-z]+)+(?:Ts)?(?<!Type))$"),
+    "paramspec": re.compile(r"^_{0,2}(?:[A-Z]+|(?:[A-Z]+[a-z0-9]+)+(?:P)?(?<!Type))$"),
+    "typevartuple": re.compile(
+        r"^_{0,2}(?:[A-Z]+|(?:[A-Z]+[a-z0-9]+)+(?:Ts)?(?<!Type))$"
+    ),
     "typealias": re.compile(
         r"^_{0,2}(?!T[A-Z]|Type)[A-Z]+[a-z0-9]+(?:[A-Z][a-z0-9]+)*$"
     ),

tests/functional/t/type/typevar_naming_style_default.311.txt

@@ -1,24 +1,24 @@
-typevar-name-incorrect-variance:11:0:11:21::"Type variable name does not reflect variance. ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
-typevar-double-variance:19:0:19:1::TypeVar cannot be both covariant and contravariant:INFERENCE
-typevar-name-incorrect-variance:19:0:19:1::Type variable name does not reflect variance:INFERENCE
-typevar-double-variance:23:0:23:4::TypeVar cannot be both covariant and contravariant:INFERENCE
-typevar-name-incorrect-variance:23:0:23:4::Type variable name does not reflect variance:INFERENCE
-typevar-double-variance:24:0:24:8::TypeVar cannot be both covariant and contravariant:INFERENCE
-typevar-name-incorrect-variance:24:0:24:8::Type variable name does not reflect variance:INFERENCE
-invalid-name:42:0:42:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
-invalid-name:43:0:43:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
-invalid-name:44:0:44:10::"Type variable name ""IPAddressU"" doesn't conform to predefined naming style":HIGH
-invalid-name:47:0:47:7::"Type variable name ""TAnyStr"" doesn't conform to predefined naming style":HIGH
-invalid-name:50:0:50:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
-invalid-name:51:0:51:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
-invalid-name:52:0:52:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
-invalid-name:56:4:56:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
-invalid-name:57:4:57:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
-typevar-name-incorrect-variance:57:4:57:26::"Type variable name does not reflect variance. ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
-invalid-name:59:13:59:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH
-invalid-name:68:0:68:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
-typevar-double-variance:69:0:69:4::TypeVar cannot be both covariant and contravariant:INFERENCE
-typevar-name-incorrect-variance:69:0:69:4::Type variable name does not reflect variance:INFERENCE
-invalid-name:76:0:76:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
-invalid-name:82:0:82:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
-invalid-name:96:0:96:7::"Type variable tuple name ""badName"" doesn't conform to predefined naming style":HIGH
+typevar-name-incorrect-variance:11:0:11:21::"Type variable name does not reflect variance. ""GoodNameWithoutContra"" is contravariant, use ""GoodNameWithoutContra_contra"" instead":INFERENCE
+typevar-double-variance:19:0:19:1::TypeVar cannot be both covariant and contravariant:INFERENCE
+typevar-name-incorrect-variance:19:0:19:1::Type variable name does not reflect variance:INFERENCE
+typevar-double-variance:23:0:23:4::TypeVar cannot be both covariant and contravariant:INFERENCE
+typevar-name-incorrect-variance:23:0:23:4::Type variable name does not reflect variance:INFERENCE
+typevar-double-variance:24:0:24:8::TypeVar cannot be both covariant and contravariant:INFERENCE
+typevar-name-incorrect-variance:24:0:24:8::Type variable name does not reflect variance:INFERENCE
+invalid-name:42:0:42:10::"Type variable name ""CALLABLE_T"" doesn't conform to predefined naming style":HIGH
+invalid-name:43:0:43:10::"Type variable name ""DeviceType"" doesn't conform to predefined naming style":HIGH
+invalid-name:44:0:44:10::"Type variable name ""IPAddressU"" doesn't conform to predefined naming style":HIGH
+invalid-name:47:0:47:7::"Type variable name ""TAnyStr"" doesn't conform to predefined naming style":HIGH
+invalid-name:50:0:50:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:51:0:51:10::"Type variable name ""badName_co"" doesn't conform to predefined naming style":HIGH
+invalid-name:52:0:52:14::"Type variable name ""badName_contra"" doesn't conform to predefined naming style":HIGH
+invalid-name:56:4:56:13::"Type variable name ""a_BadName"" doesn't conform to predefined naming style":HIGH
+invalid-name:57:4:57:26::"Type variable name ""a_BadNameWithoutContra"" doesn't conform to predefined naming style":HIGH
+typevar-name-incorrect-variance:57:4:57:26::"Type variable name does not reflect variance. ""a_BadNameWithoutContra"" is contravariant, use ""a_BadNameWithoutContra_contra"" instead":INFERENCE
+invalid-name:59:13:59:29::"Type variable name ""a_BadName_contra"" doesn't conform to predefined naming style":HIGH
+invalid-name:68:0:68:7::"Type variable name ""badName"" doesn't conform to predefined naming style":HIGH
+typevar-double-variance:69:0:69:4::TypeVar cannot be both covariant and contravariant:INFERENCE
+typevar-name-incorrect-variance:69:0:69:4::Type variable name does not reflect variance:INFERENCE
+invalid-name:76:0:76:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:83:0:83:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:98:0:98:7::"Type variable tuple name ""badName"" doesn't conform to predefined naming style":HIGH

tests/functional/t/type/typevar_naming_style_default.py

@@ -74,12 +74,14 @@
 _P = ParamSpec("_P")
 GoodNameP = ParamSpec("GoodNameP")
 badName = ParamSpec("badName")  # [invalid-name]
+Ec2P = ParamSpec("Ec2P")
 
 # -- typing_extensions.ParamSpec --
 P = te.ParamSpec("P")
 _P = te.ParamSpec("_P")
 GoodNameP = te.ParamSpec("GoodNameP")
 badName = te.ParamSpec("badName")  # [invalid-name]
+Ec2P = te.ParamSpec("Ec2P")
 
 
 # # -- typing.TypeVarTuple (TODO 3.11+) --
@@ -94,3 +96,4 @@
 _Ts = te.TypeVarTuple("_Ts")
 GoodNameTs = te.TypeVarTuple("GoodNameTs")
 badName = te.TypeVarTuple("badName")  # >=3.11:[invalid-name]
+S3Ts = te.TypeVarTuple("S3Ts")

tests/functional/t/type/typevar_naming_style_default.txt

@@ -20,4 +20,4 @@ invalid-name:68:0:68:7::"Type variable name ""badName"" doesn't conform to prede
 typevar-double-variance:69:0:69:4::TypeVar cannot be both covariant and contravariant:INFERENCE
 typevar-name-incorrect-variance:69:0:69:4::Type variable name does not reflect variance:INFERENCE
 invalid-name:76:0:76:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
-invalid-name:82:0:82:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH
+invalid-name:83:0:83:7::"Parameter specification variable name ""badName"" doesn't conform to predefined naming style":HIGH