Merge pull request #24929 from anntzer/cs

Small unrelated cleanups/style fixes.

lib/matplotlib/cbook.py

@@ -1,9 +1,6 @@
 """
 A collection of utility functions and classes.  Originally, many
 (but not all) were from the Python Cookbook -- hence the name cbook.
-
-This module is safe to import from anywhere within Matplotlib;
-it imports Matplotlib only at runtime.
 """
 
 import collections
@@ -853,21 +850,11 @@ def get_siblings(self, a):
 class GrouperView:
     """Immutable view over a `.Grouper`."""
 
-    def __init__(self, grouper):
-        self._grouper = grouper
-
-    class _GrouperMethodForwarder:
-        def __set_name__(self, owner, name):
-            wrapped = getattr(Grouper, name)
-            forwarder = functools.wraps(wrapped)(
-                lambda self, *args, **kwargs: wrapped(
-                    self._grouper, *args, **kwargs))
-            setattr(owner, name, forwarder)
-
-    __contains__ = _GrouperMethodForwarder()
-    __iter__ = _GrouperMethodForwarder()
-    joined = _GrouperMethodForwarder()
-    get_siblings = _GrouperMethodForwarder()
+    def __init__(self, grouper): self._grouper = grouper
+    def __contains__(self, item): return item in self._grouper
+    def __iter__(self): return iter(self._grouper)
+    def joined(self, a, b): return self._grouper.joined(a, b)
+    def get_siblings(self, a): return self._grouper.get_siblings(a)
 
 
 def simple_linear_interpolation(a, steps):

lib/mpl_toolkits/axes_grid1/inset_locator.py

@@ -218,11 +218,9 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs):
             raise ValueError("transform should not be set")
 
         kwargs["transform"] = IdentityTransform()
-        if 'fill' in kwargs:
-            super().__init__(**kwargs)
-        else:
-            fill = bool({'fc', 'facecolor', 'color'}.intersection(kwargs))
-            super().__init__(fill=fill, **kwargs)
+        kwargs.setdefault(
+            "fill", bool({'fc', 'facecolor', 'color'}.intersection(kwargs)))
+        super().__init__(**kwargs)
         self.bbox1 = bbox1
         self.bbox2 = bbox2
         self.loc1 = loc1

lib/mpl_toolkits/mplot3d/axes3d.py

@@ -884,16 +884,13 @@ def get_proj(self):
         # Look into the middle of the world coordinates:
         R = 0.5 * box_aspect
 
-        # elev stores the elevation angle in the z plane
-        # azim stores the azimuth angle in the x,y plane
-        elev_rad = np.deg2rad(art3d._norm_angle(self.elev))
-        azim_rad = np.deg2rad(art3d._norm_angle(self.azim))
-
+        # elev: elevation angle in the z plane.
+        # azim: azimuth angle in the xy plane.
         # Coordinates for a point that rotates around the box of data.
-        # p0, p1 corresponds to rotating the box only around the
-        # vertical axis.
-        # p2 corresponds to rotating the box only around the horizontal
-        # axis.
+        # p0, p1 corresponds to rotating the box only around the vertical axis.
+        # p2 corresponds to rotating the box only around the horizontal axis.
+        elev_rad = np.deg2rad(self.elev)
+        azim_rad = np.deg2rad(self.azim)
         p0 = np.cos(elev_rad) * np.cos(azim_rad)
         p1 = np.cos(elev_rad) * np.sin(azim_rad)
         p2 = np.sin(elev_rad)