enhanced tests and made hatchcolors param required in _iter_collection()

Author: r3kste

lib/matplotlib/backend_bases.py

@@ -345,7 +345,7 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,
 
     def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
                          edgecolors, linewidths, linestyles,
-                         antialiaseds, urls, offset_position, hatchcolors=None):
+                         antialiaseds, urls, offset_position, hatchcolors):
         """
         Helper method (along with `_iter_collection_raw_paths`) to implement
         `draw_path_collection` in a memory-efficient manner.
@@ -368,9 +368,6 @@ def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
         *path_ids*; *gc* is a graphics context and *rgbFace* is a color to
         use for filling the path.
         """
-        if hatchcolors is None:
-            hatchcolors = []
-
         Npaths = len(path_ids)
         Noffsets = len(offsets)
         N = max(Npaths, Noffsets)

lib/matplotlib/tests/test_backend_bases.py

@@ -38,7 +38,7 @@ def check(master_transform, paths, all_transforms,
                    gc, range(len(raw_paths)), offsets,
                    transforms.AffineDeltaTransform(master_transform),
                    facecolors, edgecolors, [], [], [False],
-                   [], 'screen')]
+                   [], 'screen', [])]
         uses = rb._iter_collection_uses_per_path(
             paths, all_transforms, offsets, facecolors, edgecolors)
         if raw_paths:

lib/matplotlib/tests/test_collections.py

@@ -1390,63 +1390,63 @@ def test_collection_hatchcolor_inherit_logic():
     from matplotlib.collections import PathCollection
     path = mpath.Path.unit_rectangle()
 
-    colors_1 = ['purple', 'red', 'green', 'yellow']
-    colors_2 = ['orange', 'cyan', 'blue', 'magenta']
+    edgecolors = ['purple', 'red', 'green', 'yellow']
+    hatchcolors = ['orange', 'cyan', 'blue', 'magenta']
     with mpl.rc_context({'hatch.color': 'edge'}):
         # edgecolor and hatchcolor is set
         col = PathCollection([path], hatch='//',
-                              edgecolor=colors_1, hatchcolor=colors_2)
-        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_2))
+                              edgecolor=edgecolors, hatchcolor=hatchcolors)
+        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
 
         # explicitly setting edgecolor and then hatchcolor
         col = PathCollection([path], hatch='//')
-        col.set_edgecolor(colors_1)
-        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
-        col.set_hatchcolor(colors_2)
-        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_2))
+        col.set_edgecolor(edgecolors)
+        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(edgecolors))
+        col.set_hatchcolor(hatchcolors)
+        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
 
         # explicitly setting hatchcolor and then edgecolor
         col = PathCollection([path], hatch='//')
-        col.set_hatchcolor(colors_1)
-        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
-        col.set_edgecolor(colors_2)
-        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
+        col.set_hatchcolor(hatchcolors)
+        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
+        col.set_edgecolor(edgecolors)
+        assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
 
 
 def test_collection_hatchcolor_fallback_logic():
     from matplotlib.collections import PathCollection
     path = mpath.Path.unit_rectangle()
 
-    colors_1 = ['purple', 'red', 'green', 'yellow']
-    colors_2 = ['orange', 'cyan', 'blue', 'magenta']
+    edgecolors = ['purple', 'red', 'green', 'yellow']
+    hatchcolors = ['orange', 'cyan', 'blue', 'magenta']
 
     # hatchcolor parameter should take precedence over rcParam
     # When edgecolor is not set
     with mpl.rc_context({'hatch.color': 'green'}):
-        col = PathCollection([path], hatch='//', hatchcolor=colors_1)
-    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
+        col = PathCollection([path], hatch='//', hatchcolor=hatchcolors)
+    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
     # When edgecolor is set
     with mpl.rc_context({'hatch.color': 'green'}):
         col = PathCollection([path], hatch='//',
-                             edgecolor=colors_2, hatchcolor=colors_1)
-    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
+                             edgecolor=edgecolors, hatchcolor=hatchcolors)
+    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(hatchcolors))
 
     # hatchcolor should not be overridden by edgecolor when
     # hatchcolor parameter is not passed and hatch.color rcParam is set to a color
     with mpl.rc_context({'hatch.color': 'green'}):
         col = PathCollection([path], hatch='//')
         assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array('green'))
-        col.set_edgecolor(colors_1)
+        col.set_edgecolor(edgecolors)
         assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array('green'))
 
     # hatchcolor should match edgecolor when
     # hatchcolor parameter is not passed and hatch.color rcParam is set to 'edge'
     with mpl.rc_context({'hatch.color': 'edge'}):
-        col = PathCollection([path], hatch='//', edgecolor=colors_1)
-    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
+        col = PathCollection([path], hatch='//', edgecolor=edgecolors)
+    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(edgecolors))
     # hatchcolor parameter is set to 'edge'
-    col = PathCollection([path], hatch='//', edgecolor=colors_1, hatchcolor='edge')
-    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(colors_1))
+    col = PathCollection([path], hatch='//', edgecolor=edgecolors, hatchcolor='edge')
+    assert_array_equal(col.get_hatchcolor(), mpl.colors.to_rgba_array(edgecolors))
 
     # default hatchcolor should be used when hatchcolor parameter is not passed and
     # hatch.color rcParam is set to 'edge' and edgecolor is not set