CLN: a few remaining .format -> f-strings changes (#854 continued)

Author: gdementen

larray/core/axis.py

@@ -2912,8 +2912,7 @@ def to_la_ikey(axis, axis_key):
             if isinstance(axis_key, (int, np.integer, slice, Array)):
                 return axis_key
             else:
-                assert isinstance(axis_key, (list, np.ndarray)), \
-                    "unsupported key type: {} ({})".format(axis_key, type(axis_key))
+                assert isinstance(axis_key, (list, np.ndarray)), f"unsupported key type: {axis_key} ({type(axis_key)})"
                 res_axis = axis.subaxis(axis_key)
                 # TODO: for perf reasons, we should bypass creating an actual Array by returning axes and key_data
                 # but then we will need to implement a function similar to make_numpy_broadcastable which works on axes

larray/core/session.py

@@ -988,7 +988,7 @@ def items(self):
         >>> arr1, arr2 = arr1.astype(np.int64), arr2.astype(np.int64)
         >>> s = Session([('arr2', arr2), ('arr1', arr1), ('group1', group1), ('axis1', axis1)])
         >>> for k, v in s.items():
-        ...     print("{}: {}".format(k, v.info if isinstance(v, Array) else repr(v)))
+        ...     print(f"{k}: {v.info if isinstance(v, Array) else repr(v)}")
         arr2: 4
          a [4]: 'a0' 'a1' 'a2' 'a3'
         dtype: int64
@@ -1427,8 +1427,7 @@ def summary(self, template=None):
         >>> def print_array(key, array):
         ...     axes_names = ', '.join(array.axes.display_names)
         ...     shape = ' x '.join(str(i) for i in array.shape)
-        ...     return "{} -> {} ({})\\n  title = {}\\n  dtype = {}".format(key, axes_names, shape,
-        ...                                                                 array.meta.title, array.dtype)
+        ...     return f"{key} -> {axes_names} ({shape})\\n  title = {array.meta.title}\\n  dtype = {array.dtype}"
         >>> template = {Axis:  "{key} -> {name} [{labels}] ({length})",
         ...             Group: "{key} -> {name}: {axis_name}{labels} ({length})",
         ...             Array: print_array,

larray/util/misc.py

@@ -656,15 +656,10 @@ def wrapper(*args, **kwargs):
                     new_arg_value = arg_converter(old_arg_value)
                 else:
                     new_arg_value = old_arg_value
-                msg = "The {old_name}={old_val!r} keyword is deprecated, use {new_name}={new_val!r} instead"\
-                    .format(old_name=old_arg_name, old_val=old_arg_value, new_name=new_arg_name,
-                            new_val=new_arg_value)
-
-                warnings.warn(msg, FutureWarning, stacklevel=stacklevel)
+                warnings.warn(f"The {old_arg_name}={old_arg_value!r} keyword is deprecated, "
+                              f"use {new_arg_name}={new_arg_value!r} instead", FutureWarning, stacklevel=stacklevel)
                 if new_arg_name in kwargs:
-                    msg = "Can only specify '{old_name}' or '{new_name}', not both"\
-                        .format(old_name=old_arg_name, new_name=new_arg_name)
-                    raise ValueError(msg)
+                    raise ValueError(f"Can only specify '{old_arg_name}' or '{new_arg_name}', not both")
                 else:
                     kwargs[new_arg_name] = new_arg_value
             return func(*args, **kwargs)