MNT: lock in hatch rcParam at artist creation time

tacaswell · tacaswell · commit 6eb84ef59b38 · 2017-01-29T00:53:41.000-05:00
also remove some dead-code
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1111,8 +1111,6 @@ def get_hatch_color(self):
         """
         Gets the color to use for hatching.
         """
-        if self._hatch_color is None:
-            return colors.to_rgba(rcParams['hatch.color'])
         return self._hatch_color
 
     def set_hatch_color(self, hatch_color):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -136,7 +136,7 @@ def __init__(self,
         self._linewidths = [0]
         self._is_filled = True  # May be modified by set_facecolor().
 
-        self._hatch_color = None
+        self._hatch_color = mcolors.to_rgba(mpl.rcParams['hatch.color'])
         self.set_facecolor(facecolors)
         self.set_edgecolor(edgecolors)
         self.set_linewidth(linewidths)
@@ -294,14 +294,12 @@ def draw(self, renderer):
 
         if self._hatch:
             gc.set_hatch(self._hatch)
-            if self._hatch_color is not None:
-                try:
-                    gc.set_hatch_color(self._hatch_color)
-                except AttributeError:
-                    # if we end up with a GC that does not have this method
-                    warnings.warn("Your backend does not support setting the "
-                                  "hatch color.")
-
+            try:
+                gc.set_hatch_color(self._hatch_color)
+            except AttributeError:
+                # if we end up with a GC that does not have this method
+                warnings.warn("Your backend does not support setting the "
+                              "hatch color.")
 
         if self.get_sketch_params() is not None:
             gc.set_sketch_params(*self.get_sketch_params())
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -114,7 +114,7 @@ def __init__(self,
         if antialiased is None:
             antialiased = mpl.rcParams['patch.antialiased']
 
-        self._hatch_color = None
+        self._hatch_color = colors.to_rgba(mpl.rcParams['hatch.color'])
         self._fill = True  # needed for set_facecolor call
         if color is not None:
             if (edgecolor is not None or facecolor is not None):
@@ -551,13 +551,12 @@ def draw(self, renderer):
 
         if self._hatch:
             gc.set_hatch(self._hatch)
-            if self._hatch_color is not None:
-                try:
-                    gc.set_hatch_color(self._hatch_color)
-                except AttributeError:
-                    # if we end up with a GC that does not have this method
-                    warnings.warn("Your backend does not have support for "
-                                  "setting the hatch color.")
+            try:
+                gc.set_hatch_color(self._hatch_color)
+            except AttributeError:
+                # if we end up with a GC that does not have this method
+                warnings.warn("Your backend does not have support for "
+                              "setting the hatch color.")
 
         if self.get_sketch_params() is not None:
             gc.set_sketch_params(*self.get_sketch_params())
