Add requested fixes

tuncbkose · tuncbkose · commit fb4a19fdd90b · 2022-12-09T13:15:46.000+02:00
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -484,8 +484,13 @@ def val_or_rc(val, rc_name):
 
         # Figure out if self.shadow is valid
 
-        if not (is_color_like(self.shadow) or isinstance(self.shadow, bool)):
-            raise ValueError('Legend shadow must be a valid color or bool')
+        if not (is_color_like(self.shadow) or
+                self.shadow in (0, 1, True, False)
+                ):
+            raise ValueError(
+                'Legend shadow must be a valid color or bool, not '
+                f'{self.shadow!r} of type {type(self.shadow)}.'
+            )
 
         # We use FancyBboxPatch to draw a legend frame. The location
         # and size of the box will be updated during the drawing time.
@@ -674,7 +679,7 @@ def draw(self, renderer):
 
         if is_color_like(self.shadow):
             Shadow(self.legendPatch, 2, -2, color=self.shadow).draw(renderer)
-        elif self.shadow is True:
+        elif self.shadow:
             Shadow(self.legendPatch, 2, -2).draw(renderer)
 
         self.legendPatch.draw(renderer)
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -316,7 +316,7 @@ def validate_color_or_bool(c):
     try:
         return validate_bool(c)
     except ValueError:
-        raise ValueError(f'Could not convert "{c}" to color or bool')
+        raise ValueError(f'Could not convert "{c!r}" to color or bool')
 
 
 def validate_color(s):
diff --git a/lib/matplotlib/tests/baseline_images/test_legend/shadow_argument_types.png b/lib/matplotlib/tests/baseline_images/test_legend/shadow_argument_types.png
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -532,11 +532,11 @@ def test_empty_bar_chart_with_legend():
     plt.legend()
 
 
+@image_comparison(['shadow_argument_types.png'])
 def test_shadow_argument_types():
     # Test that different arguments for shadow work as expected
     fig, ax = plt.subplots()
     ax.plot([1, 2, 3], label='test')
-    shadows = [True, False, 'red', (0.1, 0.2, 0.5), 'tab:cyan', False]
 
     legs = (ax.legend(loc='upper left', shadow=True),               # True
             ax.legend(loc='upper right', shadow=False),             # False
@@ -548,11 +548,12 @@ def test_shadow_argument_types():
         ax.add_artist(l)
     ax.legend(loc='lower right')  # default
 
-    legs = [c for c in ax.get_children() if isinstance(c, mpl.legend.Legend)]
-    assert len(legs) == len(shadows)
-    for i in range(len(legs)):
-        assert legs[i].shadow == shadows[i]
 
+def test_shadow_invalid_argument():
+    # Test if invalid argument to legend shadow
+    # (i.e. not [color|bool]) raises ValueError
+    fig, ax = plt.subplots()
+    ax.plot([1, 2, 3], label='test')
     with pytest.raises(ValueError, match="color or bool"):
         ax.legend(loc="upper left", shadow="aardvark")  # Bad argument
 
