Code review updates

Author: scottshambaugh

lib/matplotlib/cbook.py

@@ -1691,7 +1691,7 @@ def pts_to_midstep(x, *args):
     return steps
 
 
-STEP_LOOKUP_MAP = {'default': None,  # Sentinel: use xy unchanged
+STEP_LOOKUP_MAP = {'default': lambda x, y: (x, y),
                    'steps': pts_to_prestep,
                    'steps-pre': pts_to_prestep,
                    'steps-post': pts_to_poststep,

lib/matplotlib/collections.py

@@ -1566,8 +1566,7 @@ def _make_verts_for_region(self, t, f1, f2, idx0, idx1):
         f2_slice = f2[idx0:idx1]
         if self._step is not None:
             step_func = cbook.STEP_LOOKUP_MAP["steps-" + self._step]
-            if step_func is not None:
-                t_slice, f1_slice, f2_slice = step_func(t_slice, f1_slice, f2_slice)
+            t_slice, f1_slice, f2_slice = step_func(t_slice, f1_slice, f2_slice)
 
         if self._interpolate:
             start = self._get_interpolating_points(t, f1, f2, idx0)

lib/matplotlib/lines.py

@@ -709,10 +709,10 @@ def recache(self, always=False):
             interpolation_steps = self._path._interpolation_steps
         else:
             interpolation_steps = 1
-        step_func = STEP_LOOKUP_MAP[self._drawstyle]
-        if step_func is None:
+        if self._drawstyle == 'default':
             vertices = self._xy
         else:
+            step_func = STEP_LOOKUP_MAP[self._drawstyle]
             vertices = np.asarray(step_func(*self._xy.T)).T
         self._path = Path(vertices, _interpolation_steps=interpolation_steps)
         self._transformed_path = None
@@ -727,10 +727,10 @@ def _transform_path(self, subslice=None):
         """
         # Masked arrays are now handled by the Path class itself
         if subslice is not None:
-            step_func = STEP_LOOKUP_MAP[self._drawstyle]
-            if step_func is None:
+            if self._drawstyle == 'default':
                 vertices = self._xy[subslice]
             else:
+                step_func = STEP_LOOKUP_MAP[self._drawstyle]
                 vertices = np.asarray(step_func(*self._xy[subslice, :].T)).T
             _path = Path(vertices,
                          _interpolation_steps=self._path._interpolation_steps)

lib/matplotlib/transforms.py

@@ -901,8 +901,6 @@ def update_from_path(self, path, ignore=None, updatex=True, updatey=True):
 
         valid_points = (np.isfinite(path.vertices[..., 0])
                         & np.isfinite(path.vertices[..., 1]))
-        if not valid_points.any():
-            return
 
         if updatex:
             x = path.vertices[..., 0][valid_points]