f-strings

Co-authored-by: Connor Ward <[email protected]>
firedrakeproject · Dec 3, 2024 · fdf6dc4 · fdf6dc4
1 parent a2a9448
commit fdf6dc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/firedrake/function.py b/firedrake/function.py
@@ -128,11 +128,11 @@ def _components(self):
             return tuple((self, ))
         else:
             if self.dof_dset.cdim == 1:
-                return tuple((CoordinatelessFunction(self.function_space().sub(0), val=self.dat,
-                                                     name="view[%d](%s)" % (0, self.name())),))
+                return (CoordinatelessFunction(self.function_space().sub(0), val=self.dat,
+                                               name=f"view[0]({self.name()})"),)
             else:
                 return tuple(CoordinatelessFunction(self.function_space().sub(i), val=op2.DatView(self.dat, j),
-                                                    name="view[%d](%s)" % (i, self.name()))
+                                                    name=f"view[{i}]({self.name()})")
                              for i, j in enumerate(np.ndindex(self.dof_dset.dim)))
 
     @PETSc.Log.EventDecorator()
@@ -151,7 +151,7 @@ def sub(self, i):
         data = self.subfunctions if mixed else self._components
         bound = len(data)
         if i < 0 or i >= bound:
-            raise IndexError("Invalid component %d, not in [0, %d)" % (i, bound))
+            raise IndexError(f"Invalid component {i}, not in [0, {bound})")
         return data[i]
 
     @property
@@ -356,7 +356,7 @@ def sub(self, i):
         data = self.subfunctions if mixed else self._components
         bound = len(data)
         if i < 0 or i >= bound:
-            raise IndexError("Invalid component %d, not in [0, %d)" % (i, bound))
+            raise IndexError(f"Invalid component {i}, not in [0, {bound})")
         return data[i]
 
     @PETSc.Log.EventDecorator()

diff --git a/firedrake/functionspaceimpl.py b/firedrake/functionspaceimpl.py
@@ -186,7 +186,7 @@ def sub(self, i):
         data = self.subfunctions if mixed else self._components
         bound = len(data)
         if i < 0 or i >= bound:
-            raise IndexError("Invalid component %d, not in [0, %d)" % (i, bound))
+            raise IndexError(f"Invalid component {i}, not in [0, {bound})")
         return data[i]
 
     @utils.cached_property
@@ -641,7 +641,7 @@ def __str__(self):
     @utils.cached_property
     def subfunctions(self):
         r"""Split into a tuple of constituent spaces."""
-        return tuple((self, ))
+        return (self, )
 
     def split(self):
         import warnings
@@ -665,7 +665,7 @@ def sub(self, i):
         r"""Return a view into the ith component."""
         bound = len(self._components)
         if i < 0 or i >= bound:
-            raise IndexError("Invalid component %d, not in [0, %d)" % (i, bound))
+            raise IndexError(f"Invalid component {i}, not in [0, {bound})")
         return self._components[i]
 
     def __mul__(self, other):