MNT: remove debugging code, clean up imports, improve warning

tacaswell · tacaswell · commit d70795d79955 · 2017-01-29T00:26:03.000-05:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1119,8 +1119,6 @@ def set_hatch_color(self, hatch_color):
         """
         Gets the color to use for hatching.
         """
-        if hatch_color is None:
-            raise ValueError()
         self._hatch_color = hatch_color
 
     def get_hatch_linewidth(self):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -299,9 +299,9 @@ def draw(self, renderer):
                     gc.set_hatch_color(self._hatch_color)
                 except AttributeError:
                     # if we end up with a GC that does not have this method
-                    import warnings
-                    warnings.warn("Your backend does not have support for "
-                                  "setting the hatch color.")
+                    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
@@ -5,6 +5,7 @@
 
 import six
 from six.moves import map, zip
+import warnings
 
 import math
 
@@ -117,7 +118,6 @@ def __init__(self,
         self._fill = True  # needed for set_facecolor call
         if color is not None:
             if (edgecolor is not None or facecolor is not None):
-                import warnings
                 warnings.warn("Setting the 'color' property will override"
                               "the edgecolor or facecolor properties. ")
             self.set_color(color)
@@ -556,7 +556,6 @@ def draw(self, renderer):
                     gc.set_hatch_color(self._hatch_color)
                 except AttributeError:
                     # if we end up with a GC that does not have this method
-                    import warnings
                     warnings.warn("Your backend does not have support for "
                                   "setting the hatch color.")
 
@@ -4305,9 +4304,8 @@ def draw(self, renderer):
                     gc.set_hatch_color(self._hatch_color)
                 except AttributeError:
                     # if we end up with a GC that does not have this method
-                    import warnings
-                    warnings.warn("Your backend does not have support for "
-                                  "setting the hatch color.")
+                    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())
