[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

mypyc/analysis/attrdefined.py

@@ -90,7 +90,7 @@ def foo(self) -> int:
     SetMem,
     Unreachable,
 )
-from mypyc.ir.rtypes import RInstance, RInstanceValue
+from mypyc.ir.rtypes import RInstance
 
 # If True, print out all always-defined attributes of native classes (to aid
 # debugging and testing)

mypyc/codegen/emit.py

@@ -23,6 +23,7 @@
 from mypyc.ir.ops import BasicBlock, Value
 from mypyc.ir.rtypes import (
     RInstance,
+    RInstanceValue,
     RPrimitive,
     RTuple,
     RType,
@@ -49,7 +50,7 @@
     is_tuple_rprimitive,
     is_uint8_rprimitive,
     object_rprimitive,
-    optional_value_type, RInstanceValue,
+    optional_value_type,
 )
 from mypyc.namegen import NameGenerator, exported_name
 from mypyc.sametype import is_same_type
@@ -1069,7 +1070,9 @@ def emit_box(
             setup_name = f"{name_prefix}_setup"
             py_type_struct = self.type_struct_name(cl)
             temp_dest = self.temp_name()
-            self.emit_line(f"{self.ctype_spaced(typ)}*{temp_dest} = ({self.ctype_spaced(typ)}*){setup_name}({py_type_struct});")
+            self.emit_line(
+                f"{self.ctype_spaced(typ)}*{temp_dest} = ({self.ctype_spaced(typ)}*){setup_name}({py_type_struct});"
+            )
             self.emit_line(f"if (unlikely({temp_dest} == NULL))")
             self.emit_line("    CPyError_OutOfMemory();")
             for attr, attr_type in cl.attributes.items():

mypyc/codegen/emitfunc.py

@@ -71,25 +71,28 @@
 )
 from mypyc.ir.pprint import generate_names_for_ir
 from mypyc.ir.rtypes import (
-    c_pyssize_t_rprimitive,
+    PyObject,
     RArray,
     RInstance,
+    RInstanceValue,
     RStruct,
     RTuple,
     RType,
+    c_pyssize_t_rprimitive,
     is_int32_rprimitive,
     is_int64_rprimitive,
     is_int_rprimitive,
     is_pointer_rprimitive,
     is_tagged,
-    PyObject,
-    RInstanceValue,
 )
 
 
 def struct_type(class_ir: ClassIR, emitter: Emitter) -> RStruct:
     """Return the struct type for this instance type."""
-    python_fields: list[tuple[str, RType]] = [("head", PyObject), ("vtable", c_pyssize_t_rprimitive)]
+    python_fields: list[tuple[str, RType]] = [
+        ("head", PyObject),
+        ("vtable", c_pyssize_t_rprimitive),
+    ]
     class_fields = list(class_ir.attributes.items())
     attr_names = [emitter.attr(name) for name, _ in python_fields + class_fields]
     attr_types = [rtype for _, rtype in python_fields + class_fields]

mypyc/codegen/emitwrapper.py

@@ -34,7 +34,7 @@
     is_bool_rprimitive,
     is_int_rprimitive,
     is_object_rprimitive,
-    object_rprimitive, RInstanceValue,
+    object_rprimitive,
 )
 from mypyc.namegen import NameGenerator
 

mypyc/ir/class_ir.py

@@ -7,7 +7,7 @@
 from mypyc.common import PROPSET_PREFIX, JsonDict
 from mypyc.ir.func_ir import FuncDecl, FuncIR, FuncSignature
 from mypyc.ir.ops import DeserMaps, Value
-from mypyc.ir.rtypes import RInstance, RType, deserialize_type, RInstanceValue
+from mypyc.ir.rtypes import RInstance, RInstanceValue, RType, deserialize_type
 from mypyc.namegen import NameGenerator, exported_name
 
 # Some notes on the vtable layout: Each concrete class has a vtable

mypyc/ir/ops.py

@@ -35,7 +35,7 @@
     object_rprimitive,
     pointer_rprimitive,
     short_int_rprimitive,
-    void_rtype, RInstanceValue,
+    void_rtype,
 )
 
 if TYPE_CHECKING:

mypyc/ir/rtypes.py

@@ -24,7 +24,6 @@
 
 from abc import abstractmethod
 from typing import TYPE_CHECKING, ClassVar, Final, Generic, TypeVar
-
 from typing_extensions import TypeGuard
 
 from mypyc.common import IS_32_BIT_PLATFORM, PLATFORM_SIZE, JsonDict, short_name

mypyc/irbuild/builder.py

@@ -15,7 +15,6 @@
 
 from contextlib import contextmanager
 from typing import Any, Callable, Final, Iterator, Sequence, Union
-
 from typing_extensions import overload
 
 from mypy.build import Graph
@@ -109,7 +108,7 @@
     is_tuple_rprimitive,
     none_rprimitive,
     object_rprimitive,
-    str_rprimitive, RInstanceValue,
+    str_rprimitive,
 )
 from mypyc.irbuild.context import FuncInfo, ImplicitClass
 from mypyc.irbuild.ll_builder import LowLevelIRBuilder

mypyc/irbuild/classdef.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from abc import abstractmethod
 from typing import Callable, Final
 
-import typing_extensions
-
 from mypy.nodes import (
     TYPE_VAR_TUPLE_KIND,
     AssignmentStmt,
@@ -64,12 +63,7 @@
     handle_non_ext_method,
     load_type,
 )
-from mypyc.irbuild.util import (
-    dataclass_type,
-    get_func_def,
-    is_constant,
-    is_dataclass_decorator,
-)
+from mypyc.irbuild.util import dataclass_type, get_func_def, is_constant, is_dataclass_decorator
 from mypyc.primitives.dict_ops import dict_new_op, dict_set_item_op
 from mypyc.primitives.generic_ops import (
     iter_op,

mypyc/irbuild/function.py

@@ -54,12 +54,7 @@
     Unreachable,
     Value,
 )
-from mypyc.ir.rtypes import (
-    bool_rprimitive,
-    dict_rprimitive,
-    int_rprimitive,
-    object_rprimitive,
-)
+from mypyc.ir.rtypes import bool_rprimitive, dict_rprimitive, int_rprimitive, object_rprimitive
 from mypyc.irbuild.builder import IRBuilder, SymbolTarget, gen_arg_defaults
 from mypyc.irbuild.callable_class import (
     add_call_to_callable_class,
@@ -91,7 +86,6 @@
 from mypyc.primitives.registry import builtin_names
 from mypyc.sametype import is_same_method_signature, is_same_type
 
-
 # Top-level transform functions
 
 

mypyc/irbuild/ll_builder.py

@@ -1431,7 +1431,9 @@ def dunder_op(self, lreg: Value, rreg: Value | None, op: str, line: int) -> Valu
         if not is_binary and len(decl.sig.args) != 1:
             return None
 
-        if is_binary and (len(decl.sig.args) != 2 or not is_subtype(rreg.type, decl.sig.args[1].type)):
+        if is_binary and (
+            len(decl.sig.args) != 2 or not is_subtype(rreg.type, decl.sig.args[1].type)
+        ):
             return None
 
         if is_binary and is_subtype(not_implemented_op.type, decl.sig.ret_type):

mypyc/irbuild/prepare.py

@@ -57,8 +57,8 @@
     get_mypyc_attrs,
     is_dataclass,
     is_extension_class,
-    is_trait,
     is_immutable,
+    is_trait,
 )
 from mypyc.options import CompilerOptions
 from mypyc.sametype import is_same_type
@@ -103,7 +103,9 @@ def build_type_map(
             if mapper.type_to_ir[cdef.info].is_ext_class:
                 prepare_class_def(module.path, module.fullname, cdef, errors, mapper, options)
             else:
-                prepare_non_ext_class_def(module.path, module.fullname, cdef, errors, mapper, options)
+                prepare_non_ext_class_def(
+                    module.path, module.fullname, cdef, errors, mapper, options
+                )
 
     # Prepare implicit attribute accessors as needed if an attribute overrides a property.
     for module, cdef in classes:
@@ -170,7 +172,11 @@ def get_module_func_defs(module: MypyFile) -> Iterable[FuncDef]:
 
 
 def prepare_func_def(
-    module_name: str, class_name: str | None, fdef: FuncDef, mapper: Mapper, options: CompilerOptions
+    module_name: str,
+    class_name: str | None,
+    fdef: FuncDef,
+    mapper: Mapper,
+    options: CompilerOptions,
 ) -> FuncDecl:
     kind = (
         FUNC_STATICMETHOD
@@ -184,10 +190,17 @@ def prepare_func_def(
 
 
 def prepare_method_def(
-    ir: ClassIR, module_name: str, cdef: ClassDef, mapper: Mapper, node: FuncDef | Decorator, options: CompilerOptions
+    ir: ClassIR,
+    module_name: str,
+    cdef: ClassDef,
+    mapper: Mapper,
+    node: FuncDef | Decorator,
+    options: CompilerOptions,
 ) -> None:
     if isinstance(node, FuncDef):
-        ir.method_decls[node.name] = prepare_func_def(module_name, cdef.name, node, mapper, options)
+        ir.method_decls[node.name] = prepare_func_def(
+            module_name, cdef.name, node, mapper, options
+        )
     elif isinstance(node, Decorator):
         # TODO: do something about abstract methods here. Currently, they are handled just like
         # normal methods.
@@ -244,7 +257,12 @@ def can_subclass_builtin(builtin_base: str) -> bool:
 
 
 def prepare_class_def(
-    path: str, module_name: str, cdef: ClassDef, errors: Errors, mapper: Mapper, options: CompilerOptions
+    path: str,
+    module_name: str,
+    cdef: ClassDef,
+    errors: Errors,
+    mapper: Mapper,
+    options: CompilerOptions,
 ) -> None:
     """Populate the interface-level information in a class IR.
 
@@ -323,7 +341,13 @@ def prepare_class_def(
 
 
 def prepare_methods_and_attributes(
-    cdef: ClassDef, ir: ClassIR, path: str, module_name: str, errors: Errors, mapper: Mapper, options: CompilerOptions
+    cdef: ClassDef,
+    ir: ClassIR,
+    path: str,
+    module_name: str,
+    errors: Errors,
+    mapper: Mapper,
+    options: CompilerOptions,
 ) -> None:
     """Populate attribute and method declarations."""
     info = cdef.info
@@ -470,7 +494,12 @@ def prepare_init_method(cdef: ClassDef, ir: ClassIR, module_name: str, mapper: M
 
 
 def prepare_non_ext_class_def(
-    path: str, module_name: str, cdef: ClassDef, errors: Errors, mapper: Mapper, options: CompilerOptions
+    path: str,
+    module_name: str,
+    cdef: ClassDef,
+    errors: Errors,
+    mapper: Mapper,
+    options: CompilerOptions,
 ) -> None:
     ir = mapper.type_to_ir[cdef.info]
     info = cdef.info

mypyc/irbuild/targets.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from mypyc.ir.ops import Register, Value
-from mypyc.ir.rtypes import RInstance, RType, object_rprimitive, RInstanceValue
+from mypyc.ir.rtypes import RInstance, RType, object_rprimitive
 
 
 class AssignmentTarget:

mypyc/irbuild/util.py

@@ -87,8 +87,8 @@ def is_immutable(cdef: ClassDef) -> bool:
     """Check if a class is immutable by checking if all its variables are marked as Final."""
     for v in cdef.info.names.values():
         if (
-            isinstance(v.node, Var) and
-            not v.node.is_classvar
+            isinstance(v.node, Var)
+            and not v.node.is_classvar
             and v.node.name not in ("__slots__", "__deletable__")
         ):
             if not v.node.is_final or v.node.is_settable_property:

mypyc/rt_subtype.py

@@ -18,6 +18,7 @@
 from mypyc.ir.rtypes import (
     RArray,
     RInstance,
+    RInstanceValue,
     RPrimitive,
     RStruct,
     RTuple,
@@ -28,7 +29,7 @@
     is_bit_rprimitive,
     is_bool_rprimitive,
     is_int_rprimitive,
-    is_short_int_rprimitive, RInstanceValue,
+    is_short_int_rprimitive,
 )
 from mypyc.subtype import is_subtype
 

mypyc/sametype.py

@@ -6,13 +6,14 @@
 from mypyc.ir.rtypes import (
     RArray,
     RInstance,
+    RInstanceValue,
     RPrimitive,
     RStruct,
     RTuple,
     RType,
     RTypeVisitor,
     RUnion,
-    RVoid, RInstanceValue,
+    RVoid,
 )
 
 

mypyc/subtype.py

@@ -5,6 +5,7 @@
 from mypyc.ir.rtypes import (
     RArray,
     RInstance,
+    RInstanceValue,
     RPrimitive,
     RStruct,
     RTuple,
@@ -20,7 +21,6 @@
     is_short_int_rprimitive,
     is_tagged,
     is_tuple_rprimitive,
-    RInstanceValue,
 )
 
 

mypyc/transform/value_type_init.py

@@ -7,7 +7,6 @@
 won't make the changes on the target object.
 """
 
-
 from mypyc.ir.func_ir import FuncIR
 from mypyc.ir.rtypes import RInstance, RInstanceValue
 from mypyc.options import CompilerOptions