pass hatchcolor arg only if it is supported by the renderer. and made suggested changes.

r3kste · r3kste · commit 7e46707c29c2 · 2025-02-16T15:00:10.000+05:30
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -2606,7 +2606,10 @@ def delta(self, other):
                         different = ours is not theirs
                     else:
                         different = bool(ours != theirs)
-                except ValueError:
+                except (ValueError, DeprecationWarning):
+                    # numpy version < 1.25 raises DeprecationWarning when array shapes
+                    # mismatch, unlike numpy >= 1.25 which raises ValueError.
+                    # This should be removed when numpy < 1.25 is no longer supported.
                     ours = np.asarray(ours)
                     theirs = np.asarray(theirs)
                     different = (ours.shape != theirs.shape or
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -420,25 +420,40 @@ def draw(self, renderer):
                 gc, paths[0], combined_transform.frozen(),
                 mpath.Path(offsets), offset_trf, tuple(facecolors[0]))
         else:
-            if self._gapcolor is not None:
-                # First draw paths within the gaps.
-                ipaths, ilinestyles = self._get_inverse_paths_linestyles()
+            # Find whether renderer.draw_path_collection() takes hatchcolor parameter
+            hatchcolors_arg_supported = True
+            try:
                 renderer.draw_path_collection(
-                    gc, transform.frozen(), ipaths,
+                    gc, transform.frozen(), [],
                     self.get_transforms(), offsets, offset_trf,
-                    [mcolors.to_rgba("none")], self._gapcolor,
-                    self._linewidths, ilinestyles,
+                    self.get_facecolor(), self.get_edgecolor(),
+                    self._linewidths, self._linestyles,
                     self._antialiaseds, self._urls,
-                    "screen", self.get_hatchcolor())
-
-            renderer.draw_path_collection(
-                gc, transform.frozen(), paths,
-                self.get_transforms(), offsets, offset_trf,
-                self.get_facecolor(), self.get_edgecolor(),
-                self._linewidths, self._linestyles,
-                self._antialiaseds, self._urls,
-                "screen",  # offset_position, kept for backcompat.
-                self.get_hatchcolor())
+                    "screen", self.get_hatchcolor()
+                )
+            except TypeError:
+                hatchcolors_arg_supported = False
+
+            if self._gapcolor is not None:
+                # First draw paths within the gaps.
+                ipaths, ilinestyles = self._get_inverse_paths_linestyles()
+                args = [gc, transform.frozen(), ipaths, self.get_transforms(),
+                        offsets, offset_trf, [mcolors.to_rgba("none")],
+                        self._gapcolor, self._linewidths, ilinestyles,
+                        self._antialiaseds, self._urls, "screen"]
+                if hatchcolors_arg_supported:
+                    args.append(self.get_hatchcolor())
+
+                renderer.draw_path_collection(*args)
+
+            args = [gc, transform.frozen(), paths, self.get_transforms(),
+                    offsets, offset_trf, self.get_facecolor(),
+                    self.get_edgecolor(), self._linewidths, self._linestyles,
+                    self._antialiaseds, self._urls, "screen"]
+            if hatchcolors_arg_supported:
+                args.append(self.get_hatchcolor())
+
+            renderer.draw_path_collection(*args)
 
         gc.restore()
         renderer.close_group(self.__class__.__name__)
