matplotlib
diff --git a/‎lib/matplotlib/bezier.py
Lines changed: 8 additions & 4 deletions b/‎lib/matplotlib/bezier.py
Lines changed: 8 additions & 4 deletions
diff --git a/‎lib/matplotlib/patches.py
Lines changed: 22 additions & 8 deletions b/‎lib/matplotlib/patches.py
Lines changed: 22 additions & 8 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.pdf
861 Bytes b/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.pdf
861 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.png
143 Bytes b/‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.png
143 Bytes
@@ -124,10 +124,11 @@ def find_bezier_t_intersecting_with_closedpath(bezier_point_at_t,
     start_inside = inside_closedpath(start)
     end_inside = inside_closedpath(end)
 
-    if not xor(start_inside, end_inside):
-        raise NonIntersectingPathException(
-            "the segment does not seem to intersect with the path"
-        )
+    if start_inside == end_inside:
+        if start != end:
+            raise NonIntersectingPathException(
+                "the segment does not seem to intersect with the path"
+            )
 
     while 1:
 
@@ -317,6 +318,9 @@ def _f(xy):
 def get_cos_sin(x0, y0, x1, y1):
     dx, dy = x1 - x0, y1 - y0
     d = (dx * dx + dy * dy) ** .5
+    # Account for divide by zero
+    if d == 0:
+        return 0.0, 0.0
     return dx / d, dy / d
 
 
 
@@ -1048,9 +1048,14 @@ def __init__(self, x, y, dx, dy, width=1.0, **kwargs):
         %(Patch)s
         """
         Patch.__init__(self, **kwargs)
-        L = np.sqrt(dx ** 2 + dy ** 2) or 1  # account for div by zero
-        cx = float(dx) / L
-        sx = float(dy) / L
+        L = np.hypot(dx, dy)
+
+        if L != 0:
+            cx = float(dx) / L
+            sx = float(dy) / L
+        else:
+            # Account for division by zero
+            cx, sx = 0, 1
 
         trans1 = transforms.Affine2D().scale(L, width)
         trans2 = transforms.Affine2D.from_values(cx, sx, -sx, cx, 0.0, 0.0)
@@ -1111,7 +1116,8 @@ def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
         if head_length is None:
             head_length = 1.5 * head_width
 
-        distance = np.sqrt(dx ** 2 + dy ** 2)
+        distance = np.hypot(dx, dy)
+
         if length_includes_head:
             length = distance
         else:
@@ -1149,8 +1155,12 @@ def __init__(self, x, y, dx, dy, width=0.001, length_includes_head=False,
                                              right_half_arrow[-2::-1]])
                 else:
                     raise ValueError("Got unknown shape: %s" % shape)
-            cx = float(dx) / distance
-            sx = float(dy) / distance
+            if distance != 0:
+                cx = float(dx) / distance
+                sx = float(dy) / distance
+            else:
+                #Account for division by zero
+                cx, sx = 0, 1
             M = np.array([[cx, sx], [-sx, cx]])
             verts = np.dot(coords, M) + (x + dx, y + dy)
 
@@ -3193,14 +3203,18 @@ def _get_arrow_wedge(self, x0, y0, x1, y1,
             """
 
             # arrow from x0, y0 to x1, y1
-
             dx, dy = x0 - x1, y0 - y1
-            cp_distance = math.sqrt(dx ** 2 + dy ** 2)
+
+            cp_distance = np.hypot(dx, dy)
 
             # pad_projected : amount of pad to account the
             # overshooting of the projection of the wedge
             pad_projected = (.5 * linewidth / sin_t)
 
+            # Account for division by zero
+            if cp_distance == 0:
+                cp_distance = 1
+
             # apply pad for projected edge
             ddx = pad_projected * dx / cp_distance
             ddy = pad_projected * dy / cp_distance