optimizations

eendebakpt · eendebakpt · commit 750dcef067d8 · 2023-07-13T14:53:11.000+02:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1620,6 +1620,7 @@ def safe_first_element(obj):
     """
     return _safe_first_finite(obj, skip_nonfinite=False)
 
+_NoValue = object()
 
 def _safe_first_finite(obj, *, skip_nonfinite=True):
     """
@@ -1661,7 +1662,11 @@ def safe_isfinite(val):
         raise RuntimeError("matplotlib does not "
                            "support generators as input")
     else:
-        return next((val for val in obj if safe_isfinite(val)), safe_first_element(obj))
+        value = next((val for val in obj if safe_isfinite(val)), _NoValue)
+        if value is _NoValue:
+            return safe_first_element(obj)
+        else:
+            return value
 
 
 def sanitize_sequence(data):
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -189,13 +189,14 @@ def set_children(self, *children):
         # Parents are stored as weak references, so that if the
         # parents are destroyed, references from the children won't
         # keep them alive.
+        id_self = id(self)
         for child in children:
             # Use weak references so this dictionary won't keep obsolete nodes
             # alive; the callback deletes the dictionary entry. This is a
             # performance improvement over using WeakValueDictionary.
             ref = weakref.ref(
-                self, lambda _, pop=child._parents.pop, k=id(self): pop(k))
-            child._parents[id(self)] = ref
+                self, lambda _, pop=child._parents.pop, k=id_self: pop(k))
+            child._parents[id_self] = ref
 
     def frozen(self):
         """
@@ -1773,7 +1774,7 @@ def __array__(self, *args, **kwargs):
 
     def __eq__(self, other):
         if getattr(other, "is_affine", False) and hasattr(other, "get_matrix"):
-            return np.all(self.get_matrix() == other.get_matrix())
+            return (self.get_matrix() == other.get_matrix()).all()
         return NotImplemented
 
     def transform(self, values):
