Remove kwargs from issubclass.

edb/edgeql/compiler/schemactx.py

@@ -548,9 +548,7 @@ def apply_intersection(
         # of the argument, then this is, effectively, a NOP.
         return TypeIntersectionResult(stype=left)
 
-    if right.issubclass(
-        ctx.env.schema, left, check_opaque_unions=True, check_views=True
-    ):
+    if right.issubclass(ctx.env.schema, left):
         # The intersection type is a proper *subclass* and can be directly
         # narrowed.
         return TypeIntersectionResult(
@@ -569,9 +567,7 @@ def apply_intersection(
     is_empty: bool = (
         not s_utils.expand_type_expr_descendants(int_type, ctx.env.schema)
     )
-    is_subtype: bool = int_type.issubclass(
-        ctx.env.schema, left, check_opaque_unions=True, check_views=True,
-    )
+    is_subtype: bool = int_type.issubclass(ctx.env.schema, left)
 
     return TypeIntersectionResult(
         stype=int_type,

edb/schema/objects.py

@@ -3025,19 +3025,18 @@ class SubclassableObject(Object):
     )
 
     def _issubclass(
-        self, schema: s_schema.Schema, parent: SubclassableObject, **kwargs: Any
+        self, schema: s_schema.Schema, parent: SubclassableObject
     ) -> bool:
         return parent == self
 
     def issubclass(
         self,
         schema: s_schema.Schema,
         parent: Union[SubclassableObject, Tuple[SubclassableObject, ...]],
-        **kwargs: Any,
     ) -> bool:
         from . import types as s_types
         if isinstance(parent, tuple):
-            return any(self.issubclass(schema, p, **kwargs) for p in parent)
+            return any(self.issubclass(schema, p) for p in parent)
         if (
             isinstance(parent, s_types.Type)
             and parent.is_anyobject(schema)
@@ -3048,7 +3047,7 @@ def issubclass(
         if isinstance(parent, s_types.Type) and parent.is_any(schema):
             return True
 
-        return self._issubclass(schema, parent, **kwargs)
+        return self._issubclass(schema, parent)
 
 
 InheritingObjectT = TypeVar('InheritingObjectT', bound='InheritingObject')

edb/schema/types.py

@@ -1066,7 +1066,6 @@ def _issubclass(
         self,
         schema: s_schema.Schema,
         parent: so.SubclassableObject,
-        **kwargs: Any,
     ) -> bool:
         if isinstance(parent, Type) and parent.is_any(schema):
             return True
@@ -1085,7 +1084,7 @@ def _issubclass(
         for pt, my in zip(parent_types, my_types):
             if (
                 not pt.is_any(schema)
-                and not my.issubclass(schema, pt, **kwargs)
+                and not my.issubclass(schema, pt)
             ):
                 return False
 
@@ -1098,15 +1097,14 @@ def issubclass(
             so.SubclassableObject,
             typing.Tuple[so.SubclassableObject, ...],
         ],
-        **kwargs: Any,
     ) -> bool:
         if isinstance(parent, tuple):
-            return any(self.issubclass(schema, p, **kwargs) for p in parent)
+            return any(self.issubclass(schema, p) for p in parent)
 
         if isinstance(parent, Type) and parent.is_any(schema):
             return True
 
-        return self._issubclass(schema, parent, **kwargs)
+        return self._issubclass(schema, parent)
 
     def get_subtypes(self, schema: s_schema.Schema) -> typing.Tuple[Type, ...]:
         raise NotImplementedError