make footprint of changes smaller

brunobeltran · brunobeltran · commit 1bde3495c5b2 · 2020-03-21T14:52:39.000-07:00
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -71,25 +71,7 @@ def get_normal_points(cx, cy, cos_t, sin_t, length):
 # deprecated routines (moved to `.Path`)
 
 
-@cbook.deprecated("3.2")
-def inside_circle(cx, cy, r):
-    """
-    Return a function that checks whether a point is in a circle with center
-    (*cx*, *cy*) and radius *r*.
-
-    The returned function has the signature::
-
-        f(xy: Tuple[float, float]) -> bool
-    """
-    r2 = r ** 2
-
-    def _f(xy):
-        x, y = xy
-        return (x - cx) ** 2 + (y - cy) ** 2 < r2
-    return _f
-
-
-@cbook.deprecated("3.2", alternative="Path.make_compound_path()")
+@cbook.deprecated("3.2", alternative="Path.split_path_inout()")
 def split_path_inout(path, inside, tolerance=0.01, reorder_inout=False):
     """
     Divide a path into two segments at the point where ``inside(x, y)``
@@ -98,24 +80,6 @@ def split_path_inout(path, inside, tolerance=0.01, reorder_inout=False):
     return path.split_path_inout(inside, tolerance, reorder_inout)
 
 
-@cbook.deprecated(
-    "3.2", alternative="Path.cleaned() and remove the final STOP if needed")
-def make_path_regular(path):
-    """
-    If the ``codes`` attribute of `.Path` *p* is None, return a copy of *p*
-    with ``codes`` set to (MOVETO, LINETO, LINETO, ..., LINETO); otherwise
-    return *p* itself.
-    """
-    return path.make_path_regular()
-
-
-@cbook.deprecated("3.2", alternative="Path.make_compound_path()")
-def concatenate_paths(paths):
-    """Concatenate a list of paths into a single path."""
-    from .path import Path
-    return Path.make_compound_path(*paths)
-
-
 # BEZIER routines
 
 # subdividing bezier curve
@@ -270,6 +234,20 @@ def split_bezier_intersecting_with_closedpath(
     return _left, _right
 
 
+@cbook.deprecated("3.2")
+def inside_circle(cx, cy, r):
+    """
+    Return a function that checks whether a point is in a circle with center
+    (*cx*, *cy*) and radius *r*.
+
+    The returned function has the signature::
+
+        f(xy: Tuple[float, float]) -> bool
+    """
+    from .patches import _inside_circle
+    return _inside_circle(cx, cy, r)
+
+
 # quadratic Bezier lines
 
 
@@ -445,3 +423,21 @@ def make_wedged_bezier2(bezier2, width, w1=1., wm=0.5, w2=0.):
                                      c3x_right, c3y_right)
 
     return path_left, path_right
+
+
+@cbook.deprecated(
+    "3.2", alternative="Path.cleaned() and remove the final STOP if needed")
+def make_path_regular(path):
+    """
+    If the ``codes`` attribute of `.Path` *p* is None, return a copy of *p*
+    with ``codes`` set to (MOVETO, LINETO, LINETO, ..., LINETO); otherwise
+    return *p* itself.
+    """
+    return path.make_path_regular()
+
+
+@cbook.deprecated("3.2", alternative="Path.make_compound_path()")
+def concatenate_paths(paths):
+    """Concatenate a list of paths into a single path."""
+    from .path import Path
+    return Path.make_compound_path(*paths)
