Some more micro optimizations

oscargus · oscargus · commit c753de288880 · 2023-07-19T02:47:14.000+02:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1375,8 +1375,9 @@ def __clear(self):
                 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")
+                # polar requires that _set_scale is called again
+                if self.name == "polar":
+                    axis._set_scale("linear")
                 axis._set_lim(0, 1, auto=True)
         self._update_transScale()
 
@@ -2239,8 +2240,7 @@ def add_collection(self, collection, autolim=True):
         Add a `.Collection` to the Axes; return the collection.
         """
         _api.check_isinstance(mcoll.Collection, collection=collection)
-        label = collection.get_label()
-        if not label:
+        if not collection.get_label():
             collection.set_label(f'_child{len(self._children)}')
         self._children.append(collection)
         collection._remove_method = self._children.remove
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -256,7 +256,6 @@ def get_datalim(self, transData):
             # if the offsets are in some coords other than data,
             # then don't use them for autoscaling.
             return transforms.Bbox.null()
-        offsets = self.get_offsets()
 
         paths = self.get_paths()
         if not len(paths):
@@ -270,6 +269,8 @@ def get_datalim(self, transData):
             # transforms.get_affine().contains_branch(transData).  But later,
             # be careful to only apply the affine part that remains.
 
+        offsets = self.get_offsets()
+
         if any(transform.contains_branch_seperately(transData)):
             # collections that are just in data units (like quiver)
             # can properly have the axes limits set by their shape +
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -72,7 +72,7 @@ def __init__(self, *,
             joinstyle = JoinStyle.miter
 
         self._hatch_color = colors.to_rgba(mpl.rcParams['hatch.color'])
-        self._fill = True  # needed for set_facecolor call
+        self._fill = bool(fill)  # needed for set_facecolor call
         if color is not None:
             if edgecolor is not None or facecolor is not None:
                 _api.warn_external(
@@ -87,7 +87,6 @@ def __init__(self, *,
         self._unscaled_dash_pattern = (0, None)  # offset, dash
         self._dash_pattern = (0, None)  # offset, dash (scaled by linewidth)
 
-        self.set_fill(fill)
         self.set_linestyle(linestyle)
         self.set_linewidth(linewidth)
         self.set_antialiased(antialiased)
@@ -880,8 +879,7 @@ def set_bounds(self, *args):
 
     def get_bbox(self):
         """Return the `.Bbox`."""
-        x0, y0, x1, y1 = self._convert_units()
-        return transforms.Bbox.from_extents(x0, y0, x1, y1)
+        return transforms.Bbox.from_extents(*self._convert_units())
 
     xy = property(get_xy, set_xy)
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -577,10 +577,10 @@ def update_bbox_position_size(self, renderer):
             self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
 
     def _update_clip_properties(self):
-        clipprops = dict(clip_box=self.clipbox,
-                         clip_path=self._clippath,
-                         clip_on=self._clipon)
         if self._bbox_patch:
+            clipprops = dict(clip_box=self.clipbox,
+                             clip_path=self._clippath,
+                             clip_on=self._clipon)
             self._bbox_patch.update(clipprops)
 
     def set_clip_box(self, clipbox):
@@ -1271,10 +1271,9 @@ def set_text(self, s):
             Any object gets converted to its `str` representation, except for
             ``None`` which is converted to an empty string.
         """
-        if s is None:
-            s = ''
+        s = '' if s is None else str(s)
         if s != self._text:
-            self._text = str(s)
+            self._text = s
             self.stale = True
 
     def _preprocess_math(self, s):
