From 524fb8f9d084daf9e082a060fb99d9098773801b Mon Sep 17 00:00:00 2001 From: tserg <8017125+tserg@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:31:29 +0800 Subject: [PATCH] fix lint --- vyper/ast/nodes.py | 6 +++--- vyper/builtins/_signatures.py | 2 +- vyper/builtins/functions.py | 5 +---- vyper/compiler/phases.py | 7 +++++-- vyper/semantics/analysis/pre_typecheck.py | 12 +++++++++++- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/vyper/ast/nodes.py b/vyper/ast/nodes.py index 342fa11d1e..578a5952c7 100644 --- a/vyper/ast/nodes.py +++ b/vyper/ast/nodes.py @@ -888,7 +888,7 @@ def prefold(self) -> Optional[ExprNode]: elements = [e._metadata.get("folded_value") for e in self.elements] if None not in elements: return type(self).from_node(self, elements=elements) - + return None @@ -925,7 +925,7 @@ def prefold(self) -> Optional[ExprNode]: if operand is not None: value = self.op._op(operand.value) return type(operand).from_node(self, value=value) - + return None def evaluate(self) -> ExprNode: @@ -1204,7 +1204,7 @@ def prefold(self) -> Optional[ExprNode]: if None in (left, right): return None - + value = self.op._op(left.value, right.value) return NameConstant.from_node(self, value=value) diff --git a/vyper/builtins/_signatures.py b/vyper/builtins/_signatures.py index 270176ce08..44387095a3 100644 --- a/vyper/builtins/_signatures.py +++ b/vyper/builtins/_signatures.py @@ -124,7 +124,7 @@ def _validate_arg_types(self, node): def prefold(self, node): if not hasattr(self, "evaluate"): return None - + try: return self.evaluate(node) except (UnfoldableNode, VyperException): diff --git a/vyper/builtins/functions.py b/vyper/builtins/functions.py index 223830fd59..9240df0f21 100644 --- a/vyper/builtins/functions.py +++ b/vyper/builtins/functions.py @@ -49,7 +49,6 @@ StructureException, TypeMismatch, UnfoldableNode, - VyperException, ZeroDivisionException, ) from vyper.semantics.analysis.base import VarInfo @@ -991,9 +990,7 @@ def get_denomination(self, node): try: denom = next(v for k, v in self.wei_denoms.items() if value.value in k) except StopIteration: - raise ArgumentException( - f"Unknown denomination: {value.value}", node.args[1] - ) from None + raise ArgumentException(f"Unknown denomination: {value.value}", node.args[1]) from None return denom diff --git a/vyper/compiler/phases.py b/vyper/compiler/phases.py index 4bc78e15bc..0fb56eb918 100644 --- a/vyper/compiler/phases.py +++ b/vyper/compiler/phases.py @@ -33,7 +33,7 @@ class CompilerData: vyper_module : vy_ast.Module Top-level Vyper AST node vyper_module_annotated : vy_ast.Module - Annotated but unfolded Vyper AST + Annotated but unfolded Vyper AST vyper_module_folded : vy_ast.Module Annotated and folded Vyper AST global_ctx : GlobalContext @@ -139,7 +139,10 @@ def vyper_module_annotated(self) -> vy_ast.Module: @cached_property def _folded_module(self): return generate_folded_ast( - self.contract_path, self.vyper_module_annotated, self.input_bundle, self.storage_layout_override + self.contract_path, + self.vyper_module_annotated, + self.input_bundle, + self.storage_layout_override, ) @property diff --git a/vyper/semantics/analysis/pre_typecheck.py b/vyper/semantics/analysis/pre_typecheck.py index 67adf0e209..5eaf901d0f 100644 --- a/vyper/semantics/analysis/pre_typecheck.py +++ b/vyper/semantics/analysis/pre_typecheck.py @@ -46,7 +46,17 @@ def pre_typecheck(node: vy_ast.Module): def prefold(node: vy_ast.VyperNode, constants: dict) -> None: - if isinstance(node, (vy_ast.BinOp, vy_ast.BoolOp, vy_ast.Compare, vy_ast.List, vy_ast.Subscript, vy_ast.UnaryOp)): + if isinstance( + node, + ( + vy_ast.BinOp, + vy_ast.BoolOp, + vy_ast.Compare, + vy_ast.List, + vy_ast.Subscript, + vy_ast.UnaryOp, + ), + ): node._metadata["folded_value"] = node.prefold() if isinstance(node, vy_ast.Name):