Merge pull request #14348 from anntzer/markers

QuLogic · web-flow · commit 9e9554e30f80 · 2019-05-27T20:18:28.000-04:00
Cleanup markers.py.
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -274,9 +274,7 @@ def set_fillstyle(self, fillstyle):
         """
         if fillstyle is None:
             fillstyle = rcParams['markers.fillstyle']
-        if fillstyle not in self.fillstyles:
-            raise ValueError("Unrecognized fillstyle %s"
-                             % ' '.join(self.fillstyles))
+        cbook._check_in_list(self.fillstyles, fillstyle=fillstyle)
         self._fillstyle = fillstyle
         self._recache()
 
@@ -396,9 +394,7 @@ def _set_mathtext_path(self):
         self._snap = False
 
     def _half_fill(self):
-        fs = self.get_fillstyle()
-        result = fs in self._half_fillstyles
-        return result
+        return self.get_fillstyle() in self._half_fillstyles
 
     def _set_circle(self, reduction=1.0):
         self._transform = Affine2D().scale(0.5 * reduction)
