Fix and use STEP_LOOKUP_MAP, for consistency.

anntzer · anntzer · commit db609923991d · 2016-05-29T13:13:32.000-07:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2403,12 +2403,16 @@ def pts_to_midstep(x, *args):
     # convert 2D array back to tuple
     return tuple(steps)
 
-STEP_LOOKUP_MAP = {'pre': pts_to_prestep,
+STEP_LOOKUP_MAP = {'default': lambda x, y: (x, y),
+                   'pre': pts_to_prestep,
                    'post': pts_to_poststep,
                    'mid': pts_to_midstep,
                    'step-pre': pts_to_prestep,
                    'step-post': pts_to_poststep,
-                   'step-mid': pts_to_midstep}
+                   'step-mid': pts_to_midstep,
+                   'steps-pre': pts_to_prestep,
+                   'steps-post': pts_to_poststep,
+                   'steps-mid': pts_to_midstep}
 
 
 def index_of(y):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -17,7 +17,7 @@
 from . import artist, colors as mcolors
 from .artist import Artist
 from .cbook import (iterable, is_string_like, is_numlike, ls_mapper_r,
-                    pts_to_prestep, pts_to_poststep, pts_to_midstep)
+                    STEP_LOOKUP_MAP)
 
 from .path import Path
 from .transforms import Bbox, TransformedPath, IdentityTransform
@@ -237,22 +237,13 @@ class Line2D(Artist):
         'steps': '_draw_steps_pre',
     }
 
-    # drawStyles should now be deprecated.
     drawStyles = {}
     drawStyles.update(_drawStyles_l)
     drawStyles.update(_drawStyles_s)
     # Need a list ordered with long names first:
     drawStyleKeys = (list(six.iterkeys(_drawStyles_l)) +
                      list(six.iterkeys(_drawStyles_s)))
 
-    _drawstyle_conv = {
-        'default': lambda x, y: (x, y),
-        'steps': pts_to_prestep,
-        'steps-pre': pts_to_prestep,
-        'steps-mid': pts_to_midstep,
-        'steps-post': pts_to_poststep
-    }
-
     # Referenced here to maintain API.  These are defined in
     # MarkerStyle
     markers = MarkerStyle.markers
@@ -688,7 +679,7 @@ def recache(self, always=False):
             interpolation_steps = self._path._interpolation_steps
         else:
             interpolation_steps = 1
-        xy = self._drawstyle_conv[self._drawstyle](*self._xy.T)
+        xy = STEP_LOOKUP_MAP[self._drawstyle](*self._xy.T)
         self._path = Path(np.asarray(xy).T, None, interpolation_steps)
         self._transformed_path = None
         self._invalidx = False
