MNT: move helper function into update

tacaswell · tacaswell · commit 3401a5d7e04c · 2015-12-01T11:58:41.000-05:00
Hide private helper method more thoroughly.
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -843,10 +843,35 @@ def update(self, props):
         Update the properties of this :class:`Artist` from the
         dictionary *prop*.
         """
+        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 func is None or not six.callable(func):
+                    raise AttributeError('Unknown property %s' % k)
+                return func(v)
+
         store = self.eventson
         self.eventson = False
         try:
-            ret = [self._update_property(k, v)
+            ret = [_update_property(self, k, v)
                    for k, v in sorted(props.items(), reverse=True)]
         finally:
             self.eventson = store
@@ -856,36 +881,6 @@ def update(self, props):
             self.stale = True
         return ret
 
-    def _update_property(self, k, v):
-        """helper function for set, update, setp
-
-        This function takes care of sorting out if this should be done
-        through a `set_*` method or a property.
-
-        Parameters
-        ----------
-        k : str
-            The 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 return 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 func is None or not six.callable(func):
-                raise AttributeError('Unknown property %s' % k)
-            return func(v)
-
     def get_label(self):
         """
         Get the label used for this artist in the legend.
