Fix CI

Author: georgesittas

mypyc/irbuild/classdef.py

@@ -764,11 +764,9 @@ def find_attr_initializers(
         if info_ir is None:
             continue
         for stmt in info.defn.defs.body:
-            if (
-                isinstance(stmt, AssignmentStmt)
-                and isinstance(stmt.lvalues[0], NameExpr)
-                and stmt.lvalues[0].name == "__deletable__"
-            ):
+            if not isinstance(stmt, AssignmentStmt):
+                continue
+            if isinstance(stmt.lvalues[0], NameExpr) and stmt.lvalues[0].name == "__deletable__":
                 check_deletable_declaration(builder, cls, stmt.line)
                 continue
             name = default_attr_name(stmt, info_ir, cls_type)

mypyc/irbuild/prepare.py

@@ -21,6 +21,7 @@
 from mypy.nodes import (
     ARG_STAR,
     ARG_STAR2,
+    AssignmentStmt,
     CallExpr,
     ClassDef,
     Decorator,
@@ -432,7 +433,9 @@ def _has_own_default_attrs(cdef: ClassDef, ir: ClassIR) -> bool:
         return False
     cls_type = dataclass_type(cdef)
     return any(
-        default_attr_name(stmt, ir, cls_type) is not None for stmt in cdef.info.defn.defs.body
+        default_attr_name(stmt, ir, cls_type) is not None
+        for stmt in cdef.info.defn.defs.body
+        if isinstance(stmt, AssignmentStmt)
     )
 
 

mypyc/irbuild/util.py

@@ -24,7 +24,6 @@
     NameExpr,
     OverloadedFuncDef,
     RefExpr,
-    Statement,
     StrExpr,
     TempNode,
     TupleExpr,
@@ -123,16 +122,14 @@ def defaults_skip(stmt: AssignmentStmt, cls_type: str | None) -> bool:
     return False
 
 
-def default_attr_name(stmt: Statement, ir: ClassIR, cls_type: str | None) -> str | None:
+def default_attr_name(stmt: AssignmentStmt, ir: ClassIR, cls_type: str | None) -> str | None:
     """Return the attribute name if `stmt` is a class-level default assignment
     that __mypyc_defaults_setup should emit; otherwise None.
 
     Single source of truth for the predicate used by both
     mypyc.irbuild.classdef.find_attr_initializers (IR build) and
     mypyc.irbuild.prepare._has_own_default_attrs (prepare-phase decl registration).
     """
-    if not isinstance(stmt, AssignmentStmt):
-        return None
     lvalue = stmt.lvalues[0]
     if not isinstance(lvalue, NameExpr) or is_class_var(lvalue):
         return None