resolved conflict from dev_master

scopesim/effects/ter_curves.py

@@ -205,12 +205,10 @@ def plot(self, which="x", wavelength=None, *, axes=None, **kwargs):
             wunit = params["wave_unit"]
             # TODO: shouldn't need both, make sure they're equal
             if wunit != wave_unit:
-                logger.warning("wavelength units in the meta dict of "
-                             "%s are inconsistent:\n"
-                             "- wavelength_unit : %s\n"
-                             "- wave_unit : %s",
-                             {self.meta.get("name")},
-                             wave_unit, wunit)
+                logger.warning(f"wavelength units in the meta dict of "
+                             f"{self.meta.get('name')} are inconsistent: \n"
+                             f"- wavelength_unit : {wave_unit} \n"
+                             f"- wave_unit : {wunit}")
 
             wave = np.arange(quantify(params["wave_min"], wunit).value,
                              quantify(params["wave_max"], wunit).value,
@@ -223,7 +221,7 @@ def plot(self, which="x", wavelength=None, *, axes=None, **kwargs):
         abbrs = {"t": "transmission", "e": "emission",
                  "r": "reflection", "x": "throughput"}
 
-        if not isinstance(axes, Iterable):
+        if not isinstance(axes, list):
             axes = [axes]
         for ter, ax in zip(which, axes):
             y_name = abbrs.get(ter, "throughput")