limit the AttributeError exception block to the single relevant line calling getattr

lukashergt · lukashergt · commit b49cd67ba2d3 · 2025-08-14T11:25:25.000+02:00
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -599,25 +599,25 @@ def __init__(
                 for getter_name in getter_names:
                     try:
                         color = getattr(handle, getter_name)()
-                        if isinstance(color, np.ndarray):
-                            if color.size == 0:
-                                continue
-                            elif (
-                                color.shape[0] == 1
-                                or np.isclose(color, color[0]).all()
-                            ):
-                                text.set_color(color[0])
-                            else:
-                                pass
-                        elif cbook._str_lower_equal(color, 'none'):
+                    except AttributeError:
+                        continue
+                    if isinstance(color, np.ndarray):
+                        if color.size == 0:
                             continue
-                        elif mpl.colors.to_rgba(color)[3] == 0:
-                                continue
+                        elif (
+                            color.shape[0] == 1
+                            or np.isclose(color, color[0]).all()
+                        ):
+                            text.set_color(color[0])
                         else:
-                            text.set_color(color)
-                        break
-                    except AttributeError:
+                            pass
+                    elif cbook._str_lower_equal(color, 'none'):
                         continue
+                    elif mpl.colors.to_rgba(color)[3] == 0:
+                            continue
+                    else:
+                        text.set_color(color)
+                    break
         elif cbook._str_equal(labelcolor, 'none'):
             for text in self.texts:
                 text.set_color(labelcolor)
