Move contiguous_regions to cbook

dstansby · dstansby · commit 1f1c6fb68ded · 2017-10-01T15:03:09.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4846,7 +4846,7 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
         x, y1, y2 = np.broadcast_arrays(np.atleast_1d(x), y1, y2)
 
         polys = []
-        for ind0, ind1 in mlab.contiguous_regions(where):
+        for ind0, ind1 in cbook.contiguous_regions(where):
             xslice = x[ind0:ind1]
             y1slice = y1[ind0:ind1]
             y2slice = y2[ind0:ind1]
@@ -4997,7 +4997,7 @@ def fill_betweenx(self, y, x1, x2=0, where=None,
         y, x1, x2 = np.broadcast_arrays(np.atleast_1d(y), x1, x2)
 
         polys = []
-        for ind0, ind1 in mlab.contiguous_regions(where):
+        for ind0, ind1 in cbook.contiguous_regions(where):
             yslice = y[ind0:ind1]
             x1slice = x1[ind0:ind1]
             x2slice = x2[ind0:ind1]
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -2024,6 +2024,32 @@ def __call__(self, key):
             break
 
 
+def contiguous_regions(mask):
+    """
+    Return a list of (ind0, ind1) such that mask[ind0:ind1].all() is
+    True and we cover all such regions
+    """
+    mask = np.asarray(mask, dtype=bool)
+
+    if not mask.size:
+        return []
+
+    # Find the indices of region changes, and correct offset
+    idx, = np.nonzero(mask[:-1] != mask[1:])
+    idx += 1
+
+    # List operations are faster for moderately sized arrays
+    idx = idx.tolist()
+
+    # Add first and/or last index if needed
+    if mask[0]:
+        idx = [0] + idx
+    if mask[-1]:
+        idx.append(len(mask))
+
+    return list(zip(idx[::2], idx[1::2]))
+
+
 def is_math_text(s):
     # Did we find an even number of non-escaped dollar signs?
     # If so, treat is as math text.
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -971,7 +971,7 @@ def span_where(x, ymin, ymax, where, **kwargs):
         passed on to the collection.
         """
         xranges = []
-        for ind0, ind1 in mlab.contiguous_regions(where):
+        for ind0, ind1 in cbook.contiguous_regions(where):
             xslice = x[ind0:ind1]
             if not len(xslice):
                 continue
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -3877,30 +3877,13 @@ def is_closed_polygon(X):
     return np.all(X[0] == X[-1])
 
 
+@cbook.deprecated("2.2", message='Moved to matplotlib.cbook')
 def contiguous_regions(mask):
     """
     return a list of (ind0, ind1) such that mask[ind0:ind1].all() is
     True and we cover all such regions
     """
-    mask = np.asarray(mask, dtype=bool)
-
-    if not mask.size:
-        return []
-
-    # Find the indices of region changes, and correct offset
-    idx, = np.nonzero(mask[:-1] != mask[1:])
-    idx += 1
-
-    # List operations are faster for moderately sized arrays
-    idx = idx.tolist()
-
-    # Add first and/or last index if needed
-    if mask[0]:
-        idx = [0] + idx
-    if mask[-1]:
-        idx.append(len(mask))
-
-    return list(zip(idx[::2], idx[1::2]))
+    return cbook.contiguous_regions(mask)
 
 
 @cbook.deprecated("2.2")
