remove a number of pending Deprecations (#14653)

Carreau · web-flow · commit f0a8f9d66f52 · 2025-01-21T06:59:23.000-08:00
diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
@@ -27,137 +27,6 @@
 #-----------------------------------------------------------------------------
 
 
-@pytest.mark.parametrize(
-    "expected, width, row_first, spread",
-    (
-        (
-            "aaaaa  bbbbb  ccccc  ddddd\n",
-            80,
-            False,
-            False,
-        ),
-        (
-            "aaaaa  ccccc\nbbbbb  ddddd\n",
-            25,
-            False,
-            False,
-        ),
-        (
-            "aaaaa  ccccc\nbbbbb  ddddd\n",
-            12,
-            False,
-            False,
-        ),
-        (
-            "aaaaa\nbbbbb\nccccc\nddddd\n",
-            10,
-            False,
-            False,
-        ),
-        (
-            "aaaaa  bbbbb  ccccc  ddddd\n",
-            80,
-            True,
-            False,
-        ),
-        (
-            "aaaaa  bbbbb\nccccc  ddddd\n",
-            25,
-            True,
-            False,
-        ),
-        (
-            "aaaaa  bbbbb\nccccc  ddddd\n",
-            12,
-            True,
-            False,
-        ),
-        (
-            "aaaaa\nbbbbb\nccccc\nddddd\n",
-            10,
-            True,
-            False,
-        ),
-        (
-            "aaaaa      bbbbb      ccccc      ddddd\n",
-            40,
-            False,
-            True,
-        ),
-        (
-            "aaaaa          ccccc\nbbbbb          ddddd\n",
-            20,
-            False,
-            True,
-        ),
-        (
-            "aaaaa  ccccc\nbbbbb  ddddd\n",
-            12,
-            False,
-            True,
-        ),
-        (
-            "aaaaa\nbbbbb\nccccc\nddddd\n",
-            10,
-            False,
-            True,
-        ),
-    ),
-)
-def test_columnize(expected, width, row_first, spread):
-    """Basic columnize tests."""
-    size = 5
-    items = [l*size for l in 'abcd']
-    with pytest.warns(PendingDeprecationWarning):
-        out = text.columnize(
-            items, displaywidth=width, row_first=row_first, spread=spread
-        )
-        assert out == expected
-
-
-def test_columnize_random():
-    """Test with random input to hopefully catch edge case """
-    for row_first in [True, False]:
-        for nitems in [random.randint(2,70) for i in range(2,20)]:
-            displaywidth = random.randint(20,200)
-            rand_len = [random.randint(2,displaywidth) for i in range(nitems)]
-            items = ['x'*l for l in rand_len]
-            with pytest.warns(PendingDeprecationWarning):
-                out = text.columnize(
-                    items, row_first=row_first, displaywidth=displaywidth
-                )
-            longer_line = max([len(x) for x in out.split("\n")])
-            longer_element = max(rand_len)
-            assert longer_line <= displaywidth, (
-                f"Columnize displayed something lager than displaywidth : {longer_line}\n"
-                f"longer element : {longer_element}\n"
-                f"displaywidth : {displaywidth}\n"
-                f"number of element : {nitems}\n"
-                f"size of each element : {rand_len}\n"
-                f"row_first={row_first}\n"
-            )
-
-
-@pytest.mark.parametrize("row_first", [True, False])
-def test_columnize_medium(row_first):
-    """Test with inputs than shouldn't be wider than 80"""
-    size = 40
-    items = [l*size for l in 'abc']
-    with pytest.warns(PendingDeprecationWarning):
-        out = text.columnize(items, row_first=row_first, displaywidth=80)
-    assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
-
-
-@pytest.mark.parametrize("row_first", [True, False])
-def test_columnize_long(row_first):
-    """Test columnize with inputs longer than the display window"""
-    size = 11
-    items = [l*size for l in 'abc']
-    with pytest.warns(PendingDeprecationWarning):
-        out = text.columnize(items, row_first=row_first, displaywidth=size - 1)
-    assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
-
-
 def eval_formatter_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os, u=u"café", b="café")
     s = f.format("{n} {n//4} {stuff.split()[0]}", **ns)
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -363,25 +363,6 @@ def marquee(txt: str = "", width: int = 78, mark: str = "*") -> str:
     return '%s %s %s' % (marks,txt,marks)
 
 
-ini_spaces_re = re.compile(r'^(\s+)')
-
-
-def num_ini_spaces(strng: str) -> int:
-    """Return the number of initial spaces in a string"""
-    warnings.warn(
-        "`num_ini_spaces` is Pending Deprecation since IPython 8.17."
-        "It is considered for removal in in future version. "
-        "Please open an issue if you believe it should be kept.",
-        stacklevel=2,
-        category=PendingDeprecationWarning,
-    )
-    ini_spaces = ini_spaces_re.match(strng)
-    if ini_spaces:
-        return ini_spaces.end()
-    else:
-        return 0
-
-
 def format_screen(strng: str) -> str:
     """Format a string for screen printing.
 
@@ -501,26 +482,6 @@ def strip_email_quotes(text: str) -> str:
     return text
 
 
-def strip_ansi(source: str) -> str:
-    """
-    Remove ansi escape codes from text.
-
-    Parameters
-    ----------
-    source : str
-        Source to remove the ansi from
-    """
-    warnings.warn(
-        "`strip_ansi` is Pending Deprecation since IPython 8.17."
-        "It is considered for removal in in future version. "
-        "Please open an issue if you believe it should be kept.",
-        stacklevel=2,
-        category=PendingDeprecationWarning,
-    )
-
-    return re.sub(r'\033\[(\d|;)+?m', '', source)
-
-
 class EvalFormatter(Formatter):
     """A String Formatter that allows evaluation of simple expressions.
 
@@ -704,153 +665,6 @@ def _get_or_default(mylist: List[T], i: int, default: T) -> T:
         return mylist[i]
 
 
-def compute_item_matrix(
-    items: List[str],
-    row_first: bool = False,
-    empty: Optional[str] = None,
-    *,
-    separator_size: int = 2,
-    displaywidth: int = 80,
-) -> Tuple[List[List[int]], Dict[str, int]]:
-    """Returns a nested list, and info to columnize items
-
-    Parameters
-    ----------
-    items
-        list of strings to columize
-    row_first : (default False)
-        Whether to compute columns for a row-first matrix instead of
-        column-first (default).
-    empty : (default None)
-        default value to fill list if needed
-    separator_size : int (default=2)
-        How much characters will be used as a separation between each columns.
-    displaywidth : int (default=80)
-        The width of the area onto which the columns should enter
-
-    Returns
-    -------
-    strings_matrix
-        nested list of string, the outer most list contains as many list as
-        rows, the innermost lists have each as many element as columns. If the
-        total number of elements in `items` does not equal the product of
-        rows*columns, the last element of some lists are filled with `None`.
-    dict_info
-        some info to make columnize easier:
-
-        num_columns
-          number of columns
-        max_rows
-          maximum number of rows (final number may be less)
-        column_widths
-          list of with of each columns
-        optimal_separator_width
-          best separator width between columns
-
-    Examples
-    --------
-    ::
-
-        In [1]: l = ['aaa','b','cc','d','eeeee','f','g','h','i','j','k','l']
-        In [2]: list, info = compute_item_matrix(l, displaywidth=12)
-        In [3]: list
-        Out[3]: [['aaa', 'f', 'k'], ['b', 'g', 'l'], ['cc', 'h', None], ['d', 'i', None], ['eeeee', 'j', None]]
-        In [4]: ideal = {'num_columns': 3, 'column_widths': [5, 1, 1], 'optimal_separator_width': 2, 'max_rows': 5}
-        In [5]: all((info[k] == ideal[k] for k in ideal.keys()))
-        Out[5]: True
-    """
-    warnings.warn(
-        "`compute_item_matrix` is Pending Deprecation since IPython 8.17."
-        "It is considered for removal in in future version. "
-        "Please open an issue if you believe it should be kept.",
-        stacklevel=2,
-        category=PendingDeprecationWarning,
-    )
-    info = _find_optimal(
-        list(map(len, items)),  # type: ignore[arg-type]
-        row_first,
-        separator_size=separator_size,
-        displaywidth=displaywidth,
-    )
-    nrow, ncol = info["max_rows"], info["num_columns"]
-    if row_first:
-        return (
-            [
-                [
-                    _get_or_default(
-                        items, r * ncol + c, default=empty
-                    )  # type:ignore[misc]
-                    for c in range(ncol)
-                ]
-                for r in range(nrow)
-            ],
-            info,
-        )
-    else:
-        return (
-            [
-                [
-                    _get_or_default(
-                        items, c * nrow + r, default=empty
-                    )  # type:ignore[misc]
-                    for c in range(ncol)
-                ]
-                for r in range(nrow)
-            ],
-            info,
-        )
-
-
-def columnize(
-    items: List[str],
-    row_first: bool = False,
-    separator: str = "  ",
-    displaywidth: int = 80,
-    spread: bool = False,
-) -> str:
-    """Transform a list of strings into a single string with columns.
-
-    Parameters
-    ----------
-    items : sequence of strings
-        The strings to process.
-    row_first : (default False)
-        Whether to compute columns for a row-first matrix instead of
-        column-first (default).
-    separator : str, optional [default is two spaces]
-        The string that separates columns.
-    displaywidth : int, optional [default is 80]
-        Width of the display in number of characters.
-
-    Returns
-    -------
-    The formatted string.
-    """
-    warnings.warn(
-        "`columnize` is Pending Deprecation since IPython 8.17."
-        "It is considered for removal in future versions. "
-        "Please open an issue if you believe it should be kept.",
-        stacklevel=2,
-        category=PendingDeprecationWarning,
-    )
-    if not items:
-        return "\n"
-    matrix: List[List[int]]
-    matrix, info = compute_item_matrix(
-        items,
-        row_first=row_first,
-        separator_size=len(separator),
-        displaywidth=displaywidth,
-    )
-    if spread:
-        separator = separator.ljust(int(info["optimal_separator_width"]))
-    fmatrix: List[filter[int]] = [filter(None, x) for x in matrix]
-    sjoin = lambda x: separator.join(
-        [y.ljust(w, " ") for y, w in zip(x, cast(List[int], info["column_widths"]))]
-    )
-    return "\n".join(map(sjoin, fmatrix)) + "\n"
-
-
 def get_text_list(
     list_: List[str], last_sep: str = " and ", sep: str = ", ", wrap_item_with: str = ""
 ) -> str:
