Use f-strings

mir_eval/display.py

@@ -859,7 +859,7 @@ def separation(
     sources = np.atleast_2d(sources)
 
     if labels is None:
-        labels = ["Source {:d}".format(_) for _ in range(len(sources))]
+        labels = [f"Source {_:d}" for _ in range(len(sources))]
 
     kwargs.setdefault("scaling", "spectrum")
 
@@ -947,8 +947,8 @@ def __ticker_midi_note(x, pos):
     octave = int(x / 12) - 1
 
     if cents == 0:
-        return "{:s}{:2d}".format(NOTES[idx], octave)
-    return "{:s}{:2d}{:+02d}".format(NOTES[idx], octave, int(cents * 100))
+        return f"{NOTES[idx]:s}{octave:2d}"
+    return f"{NOTES[idx]:s}{octave:2d}{int(cents * 100):+02d}"
 
 
 def __ticker_midi_hz(x, pos):
@@ -957,7 +957,7 @@ def __ticker_midi_hz(x, pos):
     Inputs x are interpreted as midi numbers, and converted
     to Hz.
     """
-    return "{:g}".format(midi_to_hz(x))
+    return f"{midi_to_hz(x):g}"
 
 
 def ticker_notes(ax=None):

mir_eval/io.py

@@ -27,7 +27,7 @@ def _open(file_or_str, **kwargs):
         with open(file_or_str, **kwargs) as file_desc:
             yield file_desc
     else:
-        raise IOError("Invalid file-or-str object: {}".format(file_or_str))
+        raise IOError(f"Invalid file-or-str object: {file_or_str}")
 
 
 def load_delimited(filename, converters, delimiter=r"\s+", comment="#"):
@@ -77,7 +77,7 @@ def load_delimited(filename, converters, delimiter=r"\s+", comment="#"):
     if comment is None:
         commenter = None
     else:
-        commenter = re.compile("^{}".format(comment))
+        commenter = re.compile(f"^{comment}")
 
     # Note: we do io manually here for two reasons.
     #   1. The csv module has difficulties with unicode, which may lead
@@ -524,7 +524,7 @@ def load_key(filename, delimiter=r"\s+", comment="#"):
         raise ValueError("Key file should contain only one line.")
     scale, mode = scale[0], mode[0]
     # Join with a space
-    key_string = "{} {}".format(scale, mode)
+    key_string = f"{scale} {mode}"
     # Validate them, but throw a warning in place of an error
     try:
         key.validate_key(key_string)
@@ -581,7 +581,7 @@ def load_tempo(filename, delimiter=r"\s+", comment="#"):
         warnings.warn(error.args[0])
 
     if not 0 <= weight <= 1:
-        raise ValueError("Invalid weight: {}".format(weight))
+        raise ValueError(f"Invalid weight: {weight}")
 
     return tempi, weight
 
@@ -646,7 +646,7 @@ def load_ragged_time_series(
     if comment is None:
         commenter = None
     else:
-        commenter = re.compile("^{}".format(comment))
+        commenter = re.compile(f"^{comment}")
 
     if header:
         start_row = 1

mir_eval/key.py

@@ -70,7 +70,7 @@ def validate_key(key):
             )
         if mode not in ["major", "minor", "other"]:
             raise ValueError(
-                "Mode '{}' is invalid; must be 'major', 'minor' or 'other'".format(mode)
+                f"Mode '{mode}' is invalid; must be 'major', 'minor' or 'other'"
             )
 
 

mir_eval/tempo.py

@@ -41,7 +41,7 @@ def validate_tempi(tempi, reference=True):
         raise ValueError("tempi must have exactly two values")
 
     if not np.all(np.isfinite(tempi)) or np.any(tempi < 0):
-        raise ValueError("tempi={} must be non-negative numbers".format(tempi))
+        raise ValueError(f"tempi={tempi} must be non-negative numbers")
 
     if reference and np.all(tempi == 0):
         raise ValueError(

mir_eval/util.py

@@ -66,7 +66,7 @@ def generate_labels(items, prefix="__"):
         Synthetically generated labels
 
     """
-    return ["{}{}".format(prefix, n) for n in range(len(items))]
+    return [f"{prefix}{n}" for n in range(len(items))]
 
 
 def intervals_to_samples(intervals, labels, offset=0, sample_size=0.1, fill_value=None):

tests/generate_data.py

@@ -110,7 +110,7 @@ def load_transcription_velocity(filename):
     tasks["key"] = (mir_eval.key, mir_eval.io.load_key, "data/key/{}*.txt")
     # Get task keys from argv
     for task in sys.argv[1:]:
-        print("Generating data for {}".format(task))
+        print(f"Generating data for {task}")
         submodule, loader, data_glob = tasks[task]
         ref_files = sorted(glob.glob(data_glob.format("ref")))
         est_files = sorted(glob.glob(data_glob.format("est")))

tests/test_util.py

@@ -153,8 +153,8 @@ def test_bipartite_match():
     #
     G = collections.defaultdict(list)
 
-    u_set = ["u{:d}".format(_) for _ in range(10)]
-    v_set = ["v{:d}".format(_) for _ in range(len(u_set) + 1)]
+    u_set = [f"u{_:d}" for _ in range(10)]
+    v_set = [f"v{_:d}" for _ in range(len(u_set) + 1)]
     for i, u in enumerate(u_set):
         for v in v_set[: -i - 1]:
             G[v].append(u)