fix: some non-enabled ruff errors

Author: alexfikl

arraycontext/impl/pytato/__init__.py

@@ -796,9 +796,9 @@ def call_loopy(self, program, **kwargs):
             elif isinstance(arg, TaggableCLArray):
                 arg = self.thaw(arg)
             else:
-                raise ValueError(f"call_loopy argument '{kw}' expected to be an"
-                                 " instance of 'pytato.Array', 'Number' or"
-                                 f"'TaggableCLArray', got '{type(arg)}'")
+                raise TypeError(f"call_loopy argument '{kw}' expected to be an"
+                                " instance of 'pytato.Array', 'Number' or"
+                                f"'TaggableCLArray', got '{type(arg)}'")
 
             processed_kwargs[kw] = arg
 

arraycontext/impl/pytato/utils.py

@@ -213,8 +213,8 @@ def map_data_wrapper(self, expr: DataWrapper) -> Array:
         import numpy as np
 
         if not isinstance(expr.data, np.ndarray):
-            raise ValueError("TransferFromNumpyMapper: tried to transfer data that "
-                             "is already on the device")
+            raise ValueError(f"{type(self).__name__}: tried to transfer data that "
+                            "is already on the device")
 
         # Ideally, this code should just do
         # return self.actx.from_numpy(expr.data).tagged(expr.tags),
@@ -245,7 +245,7 @@ def map_data_wrapper(self, expr: DataWrapper) -> Array:
 
         import arraycontext.impl.pyopencl.taggable_cl_array as tga
         if not isinstance(expr.data, tga.TaggableCLArray):
-            raise ValueError("TransferToNumpyMapper: tried to transfer data that "
+            raise ValueError(f"{type(self).__name__}: tried to transfer data that "
                              "is already on the host")
 
         np_data = self.actx.to_numpy(expr.data)

arraycontext/pytest.py

@@ -79,9 +79,10 @@ def __init__(self, device: cl.Device) -> None:
     def is_available(cls) -> bool:
         try:
             import pyopencl  # noqa: F401 # pyright: ignore[reportUnusedImport]
-            return True
         except ImportError:
             return False
+        else:
+            return True
 
     def get_command_queue(self) -> tuple[cl.Context, cl.CommandQueue]:
         # Get rid of leftovers from past tests.
@@ -155,9 +156,10 @@ def is_available(cls) -> bool:
         try:
             import pyopencl  # noqa: F401 # pyright: ignore[reportUnusedImport]
             import pytato  # noqa: F401  # pyright: ignore[reportUnusedImport]
-            return True
         except ImportError:
             return False
+        else:
+            return True
 
     @property
     def actx_class(self) -> type[ArrayContext]:
@@ -203,9 +205,10 @@ def __init__(self, *args, **kwargs) -> None:
     def is_available(cls) -> bool:
         try:
             import jax  # noqa: F401 # pyright: ignore[reportUnusedImport]
-            return True
         except ImportError:
             return False
+        else:
+            return True
 
     @override
     def __call__(self) -> ArrayContext:
@@ -231,9 +234,10 @@ def is_available(cls) -> bool:
         try:
             import jax  # noqa: F401 # pyright: ignore[reportUnusedImport]
             import pytato  # noqa: F401 # pyright: ignore[reportUnusedImport]
-            return True
         except ImportError:
             return False
+        else:
+            return True
 
     @override
     def __call__(self) -> ArrayContext: