From ec0c6eb40af6556c5cb5548e424e6b00c0d01101 Mon Sep 17 00:00:00 2001 From: donBarbos Date: Tue, 8 Jul 2025 11:56:08 +0400 Subject: [PATCH 1/3] [jmespath] Remove from pyrightconfig --- pyrightconfig.stricter.json | 1 - stubs/jmespath/jmespath/ast.pyi | 2 +- stubs/jmespath/jmespath/exceptions.pyi | 2 +- stubs/jmespath/jmespath/visitor.pyi | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json index 8e5194e9869b..dec7d09490a3 100644 --- a/pyrightconfig.stricter.json +++ b/pyrightconfig.stricter.json @@ -51,7 +51,6 @@ "stubs/httplib2", "stubs/hvac", "stubs/icalendar", - "stubs/jmespath", "stubs/jsonschema", "stubs/jwcrypto", "stubs/ldap3", diff --git a/stubs/jmespath/jmespath/ast.pyi b/stubs/jmespath/jmespath/ast.pyi index 76651892e03d..a9ee32a7c6b4 100644 --- a/stubs/jmespath/jmespath/ast.pyi +++ b/stubs/jmespath/jmespath/ast.pyi @@ -52,4 +52,4 @@ def pipe(left: _ASTNode, right: _ASTNode) -> _ASTNode: ... def projection(left: _ASTNode, right: _ASTNode) -> _ASTNode: ... def subexpression(children: list[_ASTNode]) -> _ASTNode: ... def slice(start: _ASTNode, end: _ASTNode, step: _ASTNode) -> _ASTNode: ... -def value_projection(left, right) -> _ASTNode: ... +def value_projection(left: _ASTNode, right: _ASTNode) -> _ASTNode: ... diff --git a/stubs/jmespath/jmespath/exceptions.pyi b/stubs/jmespath/jmespath/exceptions.pyi index 13500a8e0b58..45a6c4ec514e 100644 --- a/stubs/jmespath/jmespath/exceptions.pyi +++ b/stubs/jmespath/jmespath/exceptions.pyi @@ -30,7 +30,7 @@ class ArityError(ParseError): expected_arity: int actual_arity: int function_name: str - def __init__(self, expected, actual, name) -> None: ... + def __init__(self, expected: int, actual: int, name: str) -> None: ... class VariadictArityError(ArityError): ... diff --git a/stubs/jmespath/jmespath/visitor.pyi b/stubs/jmespath/jmespath/visitor.pyi index 64125ddd176f..111edf9505b5 100644 --- a/stubs/jmespath/jmespath/visitor.pyi +++ b/stubs/jmespath/jmespath/visitor.pyi @@ -17,11 +17,11 @@ class _Expression: expression: str interpreter: Visitor def __init__(self, expression: str, interpreter: Visitor) -> None: ... - def visit(self, node: _TreeNode, *args, **kwargs) -> Any: ... + def visit(self, node: _TreeNode, *args: Any, **kwargs: Any) -> Any: ... class Visitor: def __init__(self) -> None: ... - def visit(self, node: _TreeNode, *args, **kwargs) -> Any: ... + def visit(self, node: _TreeNode, *args: Any, **kwargs: Any) -> Any: ... def default_visit(self, node: _TreeNode, *args: Unused, **kwargs: Unused) -> NoReturn: ... class _TreeNode(TypedDict): @@ -59,4 +59,4 @@ class TreeInterpreter(Visitor): class GraphvizVisitor(Visitor): def __init__(self) -> None: ... - def visit(self, node: _TreeNode, *args, **kwargs) -> str: ... + def visit(self, node: _TreeNode, *args: Unused, **kwargs: Unused) -> str: ... From 899b0a9b71e8f9b59b7782dfb84ede2bed2a079d Mon Sep 17 00:00:00 2001 From: Semyon Moroz Date: Thu, 10 Jul 2025 11:09:42 +0000 Subject: [PATCH 2/3] Apply suggestion from @srittau Co-authored-by: Sebastian Rittau --- stubs/jmespath/jmespath/visitor.pyi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stubs/jmespath/jmespath/visitor.pyi b/stubs/jmespath/jmespath/visitor.pyi index 111edf9505b5..7f9a5ee0de18 100644 --- a/stubs/jmespath/jmespath/visitor.pyi +++ b/stubs/jmespath/jmespath/visitor.pyi @@ -21,6 +21,8 @@ class _Expression: class Visitor: def __init__(self) -> None: ... + # `args` and `kwargs` are passed to the appropriate `visit_*` method. + # Its return value is returned from visit. def visit(self, node: _TreeNode, *args: Any, **kwargs: Any) -> Any: ... def default_visit(self, node: _TreeNode, *args: Unused, **kwargs: Unused) -> NoReturn: ... From c16b6f5262674ce446539f84a32d8eac10543ae6 Mon Sep 17 00:00:00 2001 From: Semyon Moroz Date: Thu, 10 Jul 2025 11:09:53 +0000 Subject: [PATCH 3/3] Apply suggestion from @srittau Co-authored-by: Sebastian Rittau --- stubs/jmespath/jmespath/visitor.pyi | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/jmespath/jmespath/visitor.pyi b/stubs/jmespath/jmespath/visitor.pyi index 7f9a5ee0de18..fb8c3f63dd9a 100644 --- a/stubs/jmespath/jmespath/visitor.pyi +++ b/stubs/jmespath/jmespath/visitor.pyi @@ -17,6 +17,7 @@ class _Expression: expression: str interpreter: Visitor def __init__(self, expression: str, interpreter: Visitor) -> None: ... + # `args` and `kwargs` are passed to the appropriate `visit_*` method. def visit(self, node: _TreeNode, *args: Any, **kwargs: Any) -> Any: ... class Visitor: