use validate_[cap/join]style

brunobeltran · brunobeltran · commit 695e1e108b2a · 2020-03-19T22:51:30.000-07:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -16,6 +16,7 @@
 import matplotlib as mpl
 from . import (_path, artist, cbook, cm, colors as mcolors, docstring,
                lines as mlines, path as mpath, transforms)
+from .rcsetup import validate_joinstyle, validate_capstyle
 import warnings
 
 
@@ -599,7 +600,7 @@ def set_capstyle(self, cs):
         cs : {'butt', 'round', 'projecting'}
             The capstyle
         """
-        cbook._check_in_list(('butt', 'round', 'projecting'), capstyle=cs)
+        validate_capstyle(cs)
         self._capstyle = cs
 
     def get_capstyle(self):
@@ -614,7 +615,7 @@ def set_joinstyle(self, js):
         js : {'miter', 'round', 'bevel'}
             The joinstyle
         """
-        cbook._check_in_list(('miter', 'round', 'bevel'), joinstyle=js)
+        validate_joinstyle(js)
         self._joinstyle = js
 
     def get_joinstyle(self):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -16,6 +16,7 @@
     _to_unmasked_float_array, ls_mapper, ls_mapper_r, STEP_LOOKUP_MAP)
 from .markers import MarkerStyle
 from .path import Path
+from .rcsetup import validate_joinstyle, validate_capstyle
 from .transforms import (
     Affine2D, Bbox, BboxTransformFrom, BboxTransformTo, TransformedPath)
 
@@ -1352,8 +1353,7 @@ def set_dash_joinstyle(self, s):
         s : {'miter', 'round', 'bevel'}
             For examples see :doc:`/gallery/lines_bars_and_markers/joinstyle`.
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validJoin, s=s)
+        validate_joinstyle(s)
         if self._dashjoinstyle != s:
             self.stale = True
         self._dashjoinstyle = s
@@ -1367,8 +1367,7 @@ def set_solid_joinstyle(self, s):
         s : {'miter', 'round', 'bevel'}
             For examples see :doc:`/gallery/lines_bars_and_markers/joinstyle`.
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validJoin, s=s)
+        validate_joinstyle(s)
         if self._solidjoinstyle != s:
             self.stale = True
         self._solidjoinstyle = s
@@ -1398,8 +1397,7 @@ def set_dash_capstyle(self, s):
         s : {'butt', 'round', 'projecting'}
             For examples see :doc:`/gallery/lines_bars_and_markers/joinstyle`.
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validCap, s=s)
+        validate_capstyle(s)
         if self._dashcapstyle != s:
             self.stale = True
         self._dashcapstyle = s
@@ -1413,8 +1411,7 @@ def set_solid_capstyle(self, s):
         s : {'butt', 'round', 'projecting'}
             For examples see :doc:`/gallery/lines_bars_and_markers/joinstyle`.
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validCap, s=s)
+        validate_capstyle(s)
         if self._solidcapstyle != s:
             self.stale = True
         self._solidcapstyle = s
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -14,6 +14,7 @@
     get_parallels, inside_circle, make_wedged_bezier2,
     split_bezier_intersecting_with_closedpath, split_path_inout)
 from .path import Path
+from .rcsetup import validate_joinstyle, validate_capstyle
 
 
 @cbook._define_aliases({
@@ -461,8 +462,7 @@ def set_capstyle(self, s):
         ----------
         s : {'butt', 'round', 'projecting'}
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validCap, capstyle=s)
+        validate_capstyle(s)
         self._capstyle = s
         self.stale = True
 
@@ -477,8 +477,7 @@ def set_joinstyle(self, s):
         ----------
         s : {'miter', 'round', 'bevel'}
         """
-        s = mpl.rcsetup._deprecate_case_insensitive_join_cap(s)
-        cbook._check_in_list(self.validJoin, joinstyle=s)
+        validate_joinstyle(s)
         self._joinstyle = s
         self.stale = True
 
