Merge pull request #15989 from anntzer/update

QuLogic · web-flow · commit 330e4b2260d0 · 2019-12-24T19:03:11.000-05:00
Simplify Artist.update.
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -969,39 +969,27 @@ def set_in_layout(self, in_layout):
 
     def update(self, props):
         """
-        Update this artist's properties from the dictionary *props*.
-        """
-        def _update_property(self, k, v):
-            """Sorting out how to update property (setter or setattr).
-
-            Parameters
-            ----------
-            k : str
-                The name of property to update
-            v : obj
-                The value to assign to the property
-
-            Returns
-            -------
-            ret : obj or None
-                If using a `set_*` method return it's return, else None.
-            """
-            k = k.lower()
-            # white list attributes we want to be able to update through
-            # art.update, art.set, setp
-            if k in {'axes'}:
-                return setattr(self, k, v)
-            else:
-                func = getattr(self, 'set_' + k, None)
-                if not callable(func):
-                    raise AttributeError('{!r} object has no property {!r}'
-                                         .format(type(self).__name__, k))
-                return func(v)
+        Update this artist's properties from the dict *props*.
 
+        Parameters
+        ----------
+        props : dict
+        """
+        ret = []
         with cbook._setattr_cm(self, eventson=False):
-            ret = [_update_property(self, k, v) for k, v in props.items()]
-
-        if len(ret):
+            for k, v in props.items():
+                k = k.lower()
+                # White list attributes we want to be able to update through
+                # art.update, art.set, setp.
+                if k == "axes":
+                    ret.append(setattr(self, k, v))
+                else:
+                    func = getattr(self, f"set_{k}", None)
+                    if not callable(func):
+                        raise AttributeError(f"{type(self).__name__!r} object "
+                                             f"has no property {k!r}")
+                    ret.append(func(v))
+        if ret:
             self.pchanged()
             self.stale = True
         return ret
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -168,9 +168,7 @@ def __init__(self,
         self.update(kwargs)
 
     def update(self, kwargs):
-        """
-        Update properties from a dictionary.
-        """
+        # docstring inherited
         # Update bbox last, as it depends on font properties.
         sentinel = object()  # bbox can be None, so use another sentinel.
         bbox = kwargs.pop("bbox", sentinel)
