Merge pull request #26324 from oscargus/plotperformance

greglucas · web-flow · commit 1a37213c4e30 · 2023-07-16T11:34:00.000-06:00
More micro optimizations of plot
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -321,7 +321,7 @@ def stale(self, val):
         # if the artist is animated it does not take normal part in the
         # draw stack and is not expected to be drawn as part of the normal
         # draw loop (when not saving) so do not propagate this change
-        if self.get_animated():
+        if self._animated:
             return
 
         if val and self.stale_callback is not None:
@@ -1096,10 +1096,7 @@ def set_label(self, s):
         s : object
             *s* will be converted to a string by calling `str`.
         """
-        if s is not None:
-            self._label = str(s)
-        else:
-            self._label = None
+        self._label = str(s) if s is not None else None
         self.pchanged()
         self.stale = True
 
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1374,6 +1374,8 @@ def __clear(self):
             if share is not None:
                 getattr(self, f"share{name}")(share)
             else:
+                # Although the scale was set to linear as part of clear,
+                # polar requires that it is set again
                 axis._set_scale("linear")
                 axis._set_lim(0, 1, auto=True)
         self._update_transScale()
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -908,7 +908,6 @@ def clear(self):
 
         self.converter = None
         self.units = None
-        self.set_units(None)
         self.stale = True
 
     def reset_ticks(self):
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1769,7 +1769,7 @@ def normalize_kwargs(kw, alias_mapping=None):
 
     # deal with default value of alias_mapping
     if alias_mapping is None:
-        alias_mapping = dict()
+        alias_mapping = {}
     elif (isinstance(alias_mapping, type) and issubclass(alias_mapping, Artist)
           or isinstance(alias_mapping, Artist)):
         alias_mapping = getattr(alias_mapping, "_alias_map", {})
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -621,10 +621,10 @@ def _from_any(cls, arg):
         - a `str`: it is parsed as a fontconfig pattern;
         - a `dict`: it is passed as ``**kwargs`` to `.FontProperties`.
         """
-        if isinstance(arg, cls):
-            return arg
-        elif arg is None:
+        if arg is None:
             return cls()
+        elif isinstance(arg, cls):
+            return arg
         elif isinstance(arg, os.PathLike):
             return cls(fname=arg)
         elif isinstance(arg, str):
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -293,7 +293,6 @@ def _set_fillstyle(self, fillstyle):
             fillstyle = mpl.rcParams['markers.fillstyle']
         _api.check_in_list(self.fillstyles, fillstyle=fillstyle)
         self._fillstyle = fillstyle
-        self._recache()
 
     def get_joinstyle(self):
         return self._joinstyle.name
@@ -317,23 +316,20 @@ def _set_marker(self, marker):
             - For other possible marker values see the module docstring
               `matplotlib.markers`.
         """
-        if (isinstance(marker, np.ndarray) and marker.ndim == 2 and
+        if isinstance(marker, str) and cbook.is_math_text(marker):
+            self._marker_function = self._set_mathtext_path
+        elif isinstance(marker, (int, str)) and marker in self.markers:
+            self._marker_function = getattr(self, '_set_' + self.markers[marker])
+        elif (isinstance(marker, np.ndarray) and marker.ndim == 2 and
                 marker.shape[1] == 2):
             self._marker_function = self._set_vertices
-        elif isinstance(marker, str) and cbook.is_math_text(marker):
-            self._marker_function = self._set_mathtext_path
         elif isinstance(marker, Path):
             self._marker_function = self._set_path_marker
         elif (isinstance(marker, Sized) and len(marker) in (2, 3) and
                 marker[1] in (0, 1, 2)):
             self._marker_function = self._set_tuple_marker
-        elif (not isinstance(marker, (np.ndarray, list)) and
-              marker in self.markers):
-            self._marker_function = getattr(
-                self, '_set_' + self.markers[marker])
         elif isinstance(marker, MarkerStyle):
             self.__dict__ = copy.deepcopy(marker.__dict__)
-
         else:
             try:
                 Path(marker)
