Fix patch contains logic for patches that don't have any codes

dstansby · dstansby · commit 5c0835f87b7e · 2019-04-21T12:54:57.000+01:00
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -123,25 +123,33 @@ def _process_radius(self, radius):
         return _radius
 
     def contains(self, mouseevent, radius=None):
-        """Test whether the mouse event occurred in the patch.
+        """
+        Test whether the mouse event occurred in the patch.
 
-        Returns T/F, {}
+        Returns
+        -------
+        (bool, empty dict)
         """
         if self._contains is not None:
             return self._contains(self, mouseevent)
         radius = self._process_radius(radius)
         codes = self.get_path().codes
-        vertices = self.get_path().vertices
-        # if the current path is concatenated by multiple sub paths.
-        # get the indexes of the starting code(MOVETO) of all sub paths
-        idxs, = np.where(codes == Path.MOVETO)
-        # Don't split before the first MOVETO.
-        idxs = idxs[1:]
-        return any(
-            subpath.contains_point(
+        if codes is not None:
+            vertices = self.get_path().vertices
+            # if the current path is concatenated by multiple sub paths.
+            # get the indexes of the starting code(MOVETO) of all sub paths
+            idxs, = np.where(codes == Path.MOVETO)
+            # Don't split before the first MOVETO.
+            idxs = idxs[1:]
+            inside = any(
+                subpath.contains_point(
+                    (mouseevent.x, mouseevent.y), self.get_transform(), radius)
+                for subpath in map(
+                    Path, np.split(vertices, idxs), np.split(codes, idxs)))
+        else:
+            inside = self.get_path().contains_point(
                 (mouseevent.x, mouseevent.y), self.get_transform(), radius)
-            for subpath in map(
-                Path, np.split(vertices, idxs), np.split(codes, idxs))), {}
+        return inside, {}
 
     def contains_point(self, point, radius=None):
         """
