Simplify syntax and improve readability

ericpre · timhoffm · web-flow · commit 893e7cf1cf38 · 2021-08-24T15:57:05.000+01:00
Co-authored-by: Tim Hoffmann &lt;2836374+timhoffm@users.noreply.github.com&gt;
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -106,15 +106,13 @@ def onselect(epress, erelease):
 
     artist = tool._selection_artist
     assert artist.get_facecolor() == mcolors.to_rgba('b', alpha=0.2)
-    props = dict(facecolor='r', alpha=0.3)
-    tool.set_props(**props)
-    assert artist.get_facecolor() == mcolors.to_rgba(*props.values())
+    tool.set_props(facecolor='r', alpha=0.3)
+    assert artist.get_facecolor() == mcolors.to_rgba('r', alpha=0.3)
 
     for artist in tool._handles_artists:
         assert artist.get_markeredgecolor() == 'black'
         assert artist.get_alpha() == 0.5
-    handle_props = dict(markeredgecolor='r', alpha=0.3)
-    tool.set_handle_props(**handle_props)
+    tool.set_handle_props(markeredgecolor='r', alpha=0.3)
     for artist in tool._handles_artists:
         assert artist.get_markeredgecolor() == 'r'
         assert artist.get_alpha() == 0.3
@@ -450,15 +448,13 @@ def onselect(epress, erelease):
 
     artist = tool._selection_artist
     assert artist.get_facecolor() == mcolors.to_rgba('b', alpha=0.2)
-    props = dict(facecolor='r', alpha=0.3)
-    tool.set_props(**props)
-    assert artist.get_facecolor() == mcolors.to_rgba(*props.values())
+    tool.set_props(facecolor='r', alpha=0.3)
+    assert artist.get_facecolor() == mcolors.to_rgba('r', alpha=0.3)
 
     for artist in tool._handles_artists:
         assert artist.get_color() == 'b'
         assert artist.get_alpha() == 0.5
-    handle_props = dict(color='r', alpha=0.3)
-    tool.set_handle_props(**handle_props)
+    tool.set_handle_props(color='r', alpha=0.3)
     for artist in tool._handles_artists:
         assert artist.get_color() == 'r'
         assert artist.get_alpha() == 0.3
@@ -865,16 +861,14 @@ def onselect(vertices):
     artist = tool._selection_artist
     assert artist.get_color() == 'b'
     assert artist.get_alpha() == 0.2
-    props = dict(color='r', alpha=0.3)
-    tool.set_props(**props)
-    assert artist.get_color() == props['color']
-    assert artist.get_alpha() == props['alpha']
+    tool.set_props(color='r', alpha=0.3)
+    assert artist.get_color() == 'r'
+    assert artist.get_alpha() == 0.3
 
     for artist in tool._handles_artists:
         assert artist.get_color() == 'b'
         assert artist.get_alpha() == 0.5
-    handle_props = dict(color='r', alpha=0.3)
-    tool.set_handle_props(**handle_props)
+    tool.set_handle_props(color='r', alpha=0.3)
     for artist in tool._handles_artists:
         assert artist.get_color() == 'r'
         assert artist.get_alpha() == 0.3
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -2011,10 +2011,8 @@ def set_visible(self, visible):
     @property
     def artists(self):
         """Tuple of the artists of the selector."""
-        if getattr(self, '_handles_artists', None) is not None:
-            return (self._selection_artist, *self._handles_artists)
-        else:
-            return (self._selection_artist, )
+        handles_artists = getattr(self, '_handles_artists', ())
+        return (self._selection_artist,) + handles_artists
 
     def set_props(self, **props):
         """
@@ -2245,6 +2243,8 @@ def _setup_edge_handles(self, props):
     def _handles_artists(self):
         if self._edge_handles is not None:
             return self._edge_handles.artists
+        else:
+            return ()
 
     def _set_cursor(self, enabled):
         """Update the canvas cursor based on direction of the selector."""
