fix[ux]: replace standard strings with f-strings (#3953)

trocher · web-flow · commit 214a352f5e31 · 2024-04-15T10:20:08.000-07:00
also add flake8 FS003 rule
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ black:
 	black -C -t py311 vyper/ tests/ setup.py --force-exclude=vyper/version.py
 
 flake8: black
-	flake8 vyper/ tests/
+	flake8 --enable-extensions=FS003 vyper/ tests/
 
 isort: black
 	isort vyper/ tests/ setup.py
diff --git a/tests/functional/builtins/folding/test_keccak_sha.py b/tests/functional/builtins/folding/test_keccak_sha.py
@@ -4,7 +4,7 @@
 
 from tests.utils import parse_and_fold
 
-alphabet = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&()*+,-./:;<=>?@[]^_`{|}~'  # NOQA: E501
+alphabet = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&()*+,-./:;<=>?@[]^_`{|}~'  # NOQA: E501, FS003
 
 
 @pytest.mark.fuzzing
diff --git a/tests/functional/codegen/test_selector_table_stability.py b/tests/functional/codegen/test_selector_table_stability.py
@@ -14,7 +14,7 @@ def test_dense_jumptable_stability():
 
     # test that the selector table data is stable across different runs
     # (xdist should provide different PYTHONHASHSEEDs).
-    expected_asm = """{ DATA _sym_BUCKET_HEADERS b\'\\x0bB\' _sym_bucket_0 b\'\\n\' b\'+\\x8d\' _sym_bucket_1 b\'\\x0c\' b\'\\x00\\x85\' _sym_bucket_2 b\'\\x08\' } { DATA _sym_bucket_1 b\'\\xd8\\xee\\xa1\\xe8\' _sym_external 6 foo6()3639517672 b\'\\x05\' b\'\\xd2\\x9e\\xe0\\xf9\' _sym_external 0 foo0()3533627641 b\'\\x05\' b\'\\x05\\xf1\\xe0_\' _sym_external 2 foo2()99737695 b\'\\x05\' b\'\\x91\\t\\xb4{\' _sym_external 23 foo23()2433332347 b\'\\x05\' b\'np3\\x7f\' _sym_external 11 foo11()1852846975 b\'\\x05\' b\'&\\xf5\\x96\\xf9\' _sym_external 13 foo13()653629177 b\'\\x05\' b\'\\x04ga\\xeb\' _sym_external 14 foo14()73884139 b\'\\x05\' b\'\\x89\\x06\\xad\\xc6\' _sym_external 17 foo17()2298916294 b\'\\x05\' b\'\\xe4%\\xac\\xd1\' _sym_external 4 foo4()3827674321 b\'\\x05\' b\'yj\\x01\\xac\' _sym_external 7 foo7()2036990380 b\'\\x05\' b\'\\xf1\\xe6K\\xe5\' _sym_external 29 foo29()4058401765 b\'\\x05\' b\'\\xd2\\x89X\\xb8\' _sym_external 3 foo3()3532216504 b\'\\x05\' } { DATA _sym_bucket_2 b\'\\x06p\\xffj\' _sym_external 25 foo25()108068714 b\'\\x05\' b\'\\x964\\x99I\' _sym_external 24 foo24()2520029513 b\'\\x05\' b\'s\\x81\\xe7\\xc1\' _sym_external 10 foo10()1937893313 b\'\\x05\' b\'\\x85\\xad\\xc11\' _sym_external 28 foo28()2242756913 b\'\\x05\' b\'\\xfa"\\xb1\\xed\' _sym_external 5 foo5()4196577773 b\'\\x05\' b\'A\\xe7[\\x05\' _sym_external 22 foo22()1105681157 b\'\\x05\' b\'\\xd3\\x89U\\xe8\' _sym_external 1 foo1()3548993000 b\'\\x05\' b\'hL\\xf8\\xf3\' _sym_external 20 foo20()1749874931 b\'\\x05\' } { DATA _sym_bucket_0 b\'\\xee\\xd9\\x1d\\xe3\' _sym_external 9 foo9()4007206371 b\'\\x05\' b\'a\\xbc\\x1ch\' _sym_external 16 foo16()1639717992 b\'\\x05\' b\'\\xd3*\\xa7\\x0c\' _sym_external 21 foo21()3542787852 b\'\\x05\' b\'\\x18iG\\xd9\' _sym_external 19 foo19()409552857 b\'\\x05\' b\'\\n\\xf1\\xf9\\x7f\' _sym_external 18 foo18()183630207 b\'\\x05\' b\')\\xda\\xd7`\' _sym_external 27 foo27()702207840 b\'\\x05\' b\'2\\xf6\\xaa\\xda\' _sym_external 12 foo12()855026394 b\'\\x05\' b\'\\xbe\\xb5\\x05\\xf5\' _sym_external 15 foo15()3199534581 b\'\\x05\' b\'\\xfc\\xa7_\\xe6\' _sym_external 8 foo8()4238827494 b\'\\x05\' b\'\\x1b\\x12C8\' _sym_external 26 foo26()454181688 b\'\\x05\' } }"""  # noqa: E501
+    expected_asm = """{ DATA _sym_BUCKET_HEADERS b\'\\x0bB\' _sym_bucket_0 b\'\\n\' b\'+\\x8d\' _sym_bucket_1 b\'\\x0c\' b\'\\x00\\x85\' _sym_bucket_2 b\'\\x08\' } { DATA _sym_bucket_1 b\'\\xd8\\xee\\xa1\\xe8\' _sym_external 6 foo6()3639517672 b\'\\x05\' b\'\\xd2\\x9e\\xe0\\xf9\' _sym_external 0 foo0()3533627641 b\'\\x05\' b\'\\x05\\xf1\\xe0_\' _sym_external 2 foo2()99737695 b\'\\x05\' b\'\\x91\\t\\xb4{\' _sym_external 23 foo23()2433332347 b\'\\x05\' b\'np3\\x7f\' _sym_external 11 foo11()1852846975 b\'\\x05\' b\'&\\xf5\\x96\\xf9\' _sym_external 13 foo13()653629177 b\'\\x05\' b\'\\x04ga\\xeb\' _sym_external 14 foo14()73884139 b\'\\x05\' b\'\\x89\\x06\\xad\\xc6\' _sym_external 17 foo17()2298916294 b\'\\x05\' b\'\\xe4%\\xac\\xd1\' _sym_external 4 foo4()3827674321 b\'\\x05\' b\'yj\\x01\\xac\' _sym_external 7 foo7()2036990380 b\'\\x05\' b\'\\xf1\\xe6K\\xe5\' _sym_external 29 foo29()4058401765 b\'\\x05\' b\'\\xd2\\x89X\\xb8\' _sym_external 3 foo3()3532216504 b\'\\x05\' } { DATA _sym_bucket_2 b\'\\x06p\\xffj\' _sym_external 25 foo25()108068714 b\'\\x05\' b\'\\x964\\x99I\' _sym_external 24 foo24()2520029513 b\'\\x05\' b\'s\\x81\\xe7\\xc1\' _sym_external 10 foo10()1937893313 b\'\\x05\' b\'\\x85\\xad\\xc11\' _sym_external 28 foo28()2242756913 b\'\\x05\' b\'\\xfa"\\xb1\\xed\' _sym_external 5 foo5()4196577773 b\'\\x05\' b\'A\\xe7[\\x05\' _sym_external 22 foo22()1105681157 b\'\\x05\' b\'\\xd3\\x89U\\xe8\' _sym_external 1 foo1()3548993000 b\'\\x05\' b\'hL\\xf8\\xf3\' _sym_external 20 foo20()1749874931 b\'\\x05\' } { DATA _sym_bucket_0 b\'\\xee\\xd9\\x1d\\xe3\' _sym_external 9 foo9()4007206371 b\'\\x05\' b\'a\\xbc\\x1ch\' _sym_external 16 foo16()1639717992 b\'\\x05\' b\'\\xd3*\\xa7\\x0c\' _sym_external 21 foo21()3542787852 b\'\\x05\' b\'\\x18iG\\xd9\' _sym_external 19 foo19()409552857 b\'\\x05\' b\'\\n\\xf1\\xf9\\x7f\' _sym_external 18 foo18()183630207 b\'\\x05\' b\')\\xda\\xd7`\' _sym_external 27 foo27()702207840 b\'\\x05\' b\'2\\xf6\\xaa\\xda\' _sym_external 12 foo12()855026394 b\'\\x05\' b\'\\xbe\\xb5\\x05\\xf5\' _sym_external 15 foo15()3199534581 b\'\\x05\' b\'\\xfc\\xa7_\\xe6\' _sym_external 8 foo8()4238827494 b\'\\x05\' b\'\\x1b\\x12C8\' _sym_external 26 foo26()454181688 b\'\\x05\' } }"""  # noqa: E501, FS003
     assert expected_asm in output["asm"]
 
 
diff --git a/tests/functional/examples/tokens/test_erc1155.py b/tests/functional/examples/tokens/test_erc1155.py
@@ -7,8 +7,8 @@
 CONTRACT_NAME = "TEST 1155"
 CONTRACT_SYMBOL = "T1155"
 
-CONTRACT_URI = "https://mydomain.io/NFTdata/{id}"
-NEW_CONTRACT_URI = "https://mynewdomain.io/NFTdata/{id}"
+CONTRACT_URI = "https://mydomain.io/NFTdata/ID"
+NEW_CONTRACT_URI = "https://mynewdomain.io/NFTdata/ID"
 CONTRACT_METADATA_URI = "https://mydomain.io/NFTdata/collectionMetaData.json"
 NEW_CONTRACT_METADATA_URI = "https://mydomain.io/NFTdata/newCollectionMetaData.json"
 
diff --git a/tests/functional/syntax/test_address_code.py b/tests/functional/syntax/test_address_code.py
@@ -9,7 +9,7 @@
 from vyper.exceptions import NamespaceCollision, StructureException, VyperException
 
 # For reproducibility, use precompiled data of `hello: public(uint256)` using vyper 0.3.1
-PRECOMPILED_ABI = """[{"stateMutability": "view", "type": "function", "name": "hello", "inputs": [], "outputs": [{"name": "", "type": "uint256"}], "gas": 2460}]"""  # noqa: E501
+PRECOMPILED_ABI = """[{"stateMutability": "view", "type": "function", "name": "hello", "inputs": [], "outputs": [{"name": "", "type": "uint256"}], "gas": 2460}]"""  # noqa: E501, FS003
 PRECOMPILED_BYTECODE = """0x61004456600436101561000d57610035565b60046000601c376000513461003b576319ff1d2181186100335760005460e052602060e0f35b505b60006000fd5b600080fd5b61000461004403610004600039610004610044036000f3"""  # noqa: E501
 PRECOMPILED_BYTECODE_RUNTIME = """0x600436101561000d57610035565b60046000601c376000513461003b576319ff1d2181186100335760005460e052602060e0f35b505b60006000fd5b600080fd"""  # noqa: E501
 PRECOMPILED = bytes.fromhex(PRECOMPILED_BYTECODE_RUNTIME[2:])
diff --git a/vyper/ast/nodes.py b/vyper/ast/nodes.py
@@ -1393,7 +1393,7 @@ def _check_args(annotation, call_name):
             # do the same thing as `validate_call_args`
             # (can't be imported due to cyclic dependency)
             if len(annotation.args) != 1:
-                raise ArgumentException("Invalid number of arguments to `{call_name}`:", self)
+                raise ArgumentException(f"Invalid number of arguments to `{call_name}`:", self)
 
         # the annotation is a "function" call, e.g.
         # `foo: public(constant(uint256))`
diff --git a/vyper/ast/pre_parser.py b/vyper/ast/pre_parser.py
@@ -205,7 +205,7 @@ def pre_parse(code: str) -> tuple[Settings, ModificationOffsets, dict, str]:
                             raise StructureException("pragma evm-version specified twice!", start)
                         evm_version = pragma.removeprefix("evm-version").strip()
                         if evm_version not in EVM_VERSIONS:
-                            raise StructureException("Invalid evm version: `{evm_version}`", start)
+                            raise StructureException(f"Invalid evm version: `{evm_version}`", start)
                         settings.evm_version = evm_version
                     elif pragma.startswith("experimental-codegen"):
                         if settings.experimental_codegen is not None:
diff --git a/vyper/builtins/functions.py b/vyper/builtins/functions.py
@@ -1658,8 +1658,8 @@ class _CreateBase(BuiltinFunctionT):
 
     @process_inputs
     def build_IR(self, expr, args, kwargs, context):
-        # errmsg something like "Cannot use {self._id} in pure fn"
-        context.check_is_not_constant("use {self._id}", expr)
+        # errmsg something like f"Cannot use {self._id} in pure fn"
+        context.check_is_not_constant(f"use {self._id}", expr)
 
         should_use_create2 = "salt" in [kwarg.arg for kwarg in expr.keywords]
 
@@ -2277,7 +2277,7 @@ def build_IR(self, expr, args, kwargs, context):
             method_id = method_id_int("log(string,bytes)")
             schema = args_abi_t.selector_name().encode("utf-8")
             if len(schema) > 32:
-                raise CompilerPanic("print signature too long: {schema}")
+                raise CompilerPanic(f"print signature too long: {schema}")
 
             schema_t = StringT(len(schema))
             schema_buf = context.new_internal_variable(schema_t)
diff --git a/vyper/cli/vyper_compile.py b/vyper/cli/vyper_compile.py
@@ -284,8 +284,8 @@ def compile_files(
     if storage_layout_paths:
         if len(storage_layout_paths) != len(input_files):
             raise ValueError(
-                "provided {len(storage_layout_paths)} storage "
-                "layouts, but {len(input_files)} source files"
+                f"provided {len(storage_layout_paths)} storage "
+                f"layouts, but {len(input_files)} source files"
             )
 
     ret: dict[Any, Any] = {}
diff --git a/vyper/cli/vyper_json.py b/vyper/cli/vyper_json.py
@@ -190,7 +190,7 @@ def get_inputs(input_dict: dict) -> dict[PurePath, Any]:
 
         # some validation
         if not isinstance(value, dict):
-            raise JSONError("invalid interface (must be a dictionary):\n{json.dumps(value)}")
+            raise JSONError(f"invalid interface (must be a dictionary):\n{json.dumps(value)}")
         if "content" in value:
             if not isinstance(value["content"], str):
                 raise JSONError(f"invalid 'content' (expected string):\n{json.dumps(value)}")
@@ -199,11 +199,11 @@ def get_inputs(input_dict: dict) -> dict[PurePath, Any]:
                 raise JSONError(f"invalid 'abi' (expected list):\n{json.dumps(value)}")
         else:
             raise JSONError(
-                "invalid interface (must contain either 'content' or 'abi'):\n{json.dumps(value)}"
+                f"invalid interface (must contain either 'content' or 'abi'):\n{json.dumps(value)}"
             )
         if "content" in value and "abi" in value:
             raise JSONError(
-                "invalid interface (found both 'content' and 'abi'):\n{json.dumps(value)}"
+                f"invalid interface (found both 'content' and 'abi'):\n{json.dumps(value)}"
             )
 
         ret[path] = value
diff --git a/vyper/codegen/arithmetic.py b/vyper/codegen/arithmetic.py
@@ -289,7 +289,7 @@ def safe_div(x, y):
         if max(abs(lo), abs(hi)) * typ.divisor > 2**256 - 1:  # pragma: nocover
             # stub to prevent us from adding fixed point numbers we don't know
             # how to deal with
-            raise UnimplementedException("safe_mul for decimal{typ.bits}x{typ.decimals}")
+            raise UnimplementedException(f"safe_mul for decimal{typ.bits}x{typ.decimals}")
         x = ["mul", x, typ.divisor]
 
     DIV = "sdiv" if typ.is_signed else "div"
diff --git a/vyper/codegen/core.py b/vyper/codegen/core.py
@@ -596,7 +596,7 @@ def _get_element_ptr_mapping(parent, key):
     key = unwrap_location(key)
 
     if parent.location not in (STORAGE, TRANSIENT):  # pragma: nocover
-        raise TypeCheckFailure("bad dereference on mapping {parent}[{key}]")
+        raise TypeCheckFailure(f"bad dereference on mapping {parent}[{key}]")
 
     return IRnode.from_list(["sha3_64", parent, key], typ=subtype, location=parent.location)
 
diff --git a/vyper/semantics/analysis/base.py b/vyper/semantics/analysis/base.py
@@ -280,7 +280,7 @@ def __post_init__(self):
         if self.var_info is not None:
             for attr in should_match:
                 if getattr(self.var_info, attr) != getattr(self, attr):
-                    raise CompilerPanic("Bad analysis: non-matching {attr}: {self}")
+                    raise CompilerPanic(f"Bad analysis: non-matching {attr}: {self}")
 
         self._writes: OrderedSet[VarAccess] = OrderedSet()
         self._reads: OrderedSet[VarAccess] = OrderedSet()
diff --git a/vyper/semantics/analysis/utils.py b/vyper/semantics/analysis/utils.py
@@ -359,7 +359,7 @@ def types_from_List(self, node):
                     # for typeclasses like bytestrings, use a generic type acceptor
                     ret.append(DArrayT(t.any(), 1))
                 else:
-                    raise CompilerPanic("busted type {t}", node)
+                    raise CompilerPanic(f"busted type {t}", node)
             return ret
 
         types_list = get_common_types(*node.elements)
diff --git a/vyper/semantics/namespace.py b/vyper/semantics/namespace.py
@@ -93,7 +93,7 @@ def validate_assignment(self, attr):
             prev_decl = getattr(prev, "decl_node", None)
             msg = f"'{attr}' has already been declared"
             if prev_decl is None:
-                msg += " as a {prev}"
+                msg += f" as a {prev}"
             raise NamespaceCollision(msg, prev_decl=prev_decl)
 
 
diff --git a/vyper/semantics/types/base.py b/vyper/semantics/types/base.py
@@ -169,7 +169,7 @@ def get_size_in(self, location: DataLocation):
         if location == DataLocation.CODE:
             return self.memory_bytes_required
 
-        raise CompilerPanic("unreachable: invalid location {location}")  # pragma: nocover
+        raise CompilerPanic(f"unreachable: invalid location {location}")  # pragma: nocover
 
     @property
     def memory_bytes_required(self) -> int:
diff --git a/vyper/semantics/types/primitives.py b/vyper/semantics/types/primitives.py
@@ -94,7 +94,7 @@ def validate_literal(self, node: vy_ast.Constant) -> None:
         val = node.value
 
         if node.n_bytes != self.m:
-            raise InvalidLiteral("Invalid literal for type {self}", node)
+            raise InvalidLiteral(f"Invalid literal for type {self}", node)
 
         nibbles = val[2:]  # strip leading 0x
         if nibbles not in (nibbles.lower(), nibbles.upper()):
diff --git a/vyper/semantics/types/utils.py b/vyper/semantics/types/utils.py
@@ -171,7 +171,7 @@ def _type_from_annotation(node: vy_ast.VyperNode) -> VyperType:
         typ_ = typ_.module_t
 
     if not isinstance(typ_, VyperType):
-        raise CompilerPanic("Not a type: {typ_}", node)
+        raise CompilerPanic(f"Not a type: {typ_}", node)
 
     return typ_
 
