DEV: rename function

astromancer · astromancer · commit 84a5a32ea24b · 2024-06-13T13:55:16.000+02:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -1204,8 +1204,8 @@ class Bar3DCollection(Poly3DCollection):
 
     _n_faces = 6
 
-    def __init__(self, x, y, z, dxy='0.8', z0=0, shade=True, lightsource=None,
-                 cmap=None, **kws):
+    def __init__(self, x, y, z, dxy='0.8', z0=0,
+                 shade=True, lightsource=None, cmap=None, **kws):
         #
         x, y, z, z0 = np.ma.atleast_1d(x, y, z, z0)
         assert x.shape == y.shape == z.shape
@@ -1226,15 +1226,17 @@ def __init__(self, x, y, z, dxy='0.8', z0=0, shade=True, lightsource=None,
         # Shade faces by angle to light source
         self._original_alpha = kws.pop('alpha', 1)
         self._shade = bool(shade)
+        # resolve light source
         if lightsource is None:
             # chosen for backwards-compatibility
             lightsource = CLASSIC_LIGHTSOURCE
         else:
             assert isinstance(lightsource, mcolors.LightSource)
         self._lightsource = lightsource
 
-        COLOR_KWS = {'color', 'facecolor', 'facecolors'}
+        # resolve cmap
         if cmap is not None:
+            COLOR_KWS = {'color', 'facecolor', 'facecolors'}
             if (ckw := COLOR_KWS.intersection(kws)):
                 warnings.warn(f'Ignoring cmap since {ckw!r} provided.')
             else:
@@ -1256,7 +1258,7 @@ def _resolve_dx_dy(self, dxy):
             # scale dxy to data step.
             # get x/y step along axis -1/-2 (x/y considered constant along axis
             # -2/-1)
-            data_step = _get_data_step(xy, -i - 1) if isinstance(d[i], str) else 1
+            data_step = _get_grid_step(xy, -i - 1) if isinstance(d[i], str) else 1
             d[i] = float(d[i]) * data_step
 
         dx, dy = d
@@ -1298,7 +1300,7 @@ def set_z0(self, z0):
 
     def set_data(self, x=None, y=None, z=None, z0=None, clim=None):
         # self._xyz = np.atleast_3d(xyz)
-        assert not all(is_none(x, y, z, z0))
+        assert not all(map(is_none, (x, y, z, z0)))
 
         if (x is not None) or (y is not None):
             self._resolve_dx_dy(self.dxy)
@@ -1335,8 +1337,8 @@ def _compute_verts(self):
         xyz = np.expand_dims(np.moveaxis([x, y, z], 0, -1), (-2, -3))
         dxyz = np.empty_like(xyz)
         dxyz[..., :2] = np.array([[[self.dx]], [[self.dy]]]).T
-        dxyz[..., 2] = np.array([[self.z - self.z0]]).T
-        polys = xyz + dxyz * CUBOID[None, :]  # (n, 6, 4, 3)
+        dxyz[..., 2] = np.array(self.z - self.z0)[..., np.newaxis, np.newaxis]
+        polys = xyz + dxyz * CUBOID[np.newaxis, :]  # (n, 6, 4, 3)
 
         # collapse the first two axes
         return polys.reshape((-1, 4, 3))  # *polys.shape[-2:]
@@ -1657,7 +1659,7 @@ def _camera_position(ax):
     return r, theta, phi
 
 
-def _get_data_step(x, axis=0):
+def _get_grid_step(x, axis=0):
     # for data arrange in a regular grid, get the size of the data step by
     # looking for the first non-zero step along an axis.
     # If axis is singular, return 1
