Skip to content

Commit 414a87a

Browse files
committed
config/argparsing: use our own get_terminal_width()
1 parent bafc9bd commit 414a87a

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/_pytest/_io/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
from .terminalwriter import get_terminal_width
12
from .terminalwriter import TerminalWriter
23

34

45
__all__ = [
56
"TerminalWriter",
7+
"get_terminal_width",
68
]

src/_pytest/config/argparsing.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import py
1717

18+
import _pytest._io
1819
from _pytest.compat import TYPE_CHECKING
1920
from _pytest.config.exceptions import UsageError
2021

@@ -466,7 +467,7 @@ class DropShorterLongHelpFormatter(argparse.HelpFormatter):
466467
def __init__(self, *args: Any, **kwargs: Any) -> None:
467468
"""Use more accurate terminal width via pylib."""
468469
if "width" not in kwargs:
469-
kwargs["width"] = py.io.get_terminal_width()
470+
kwargs["width"] = _pytest._io.get_terminal_width()
470471
super().__init__(*args, **kwargs)
471472

472473
def _format_action_invocation(self, action: argparse.Action) -> str:

testing/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ def test_help_formatter_uses_py_get_terminal_width(monkeypatch):
12531253
formatter = DropShorterLongHelpFormatter("prog")
12541254
assert formatter._width == 90
12551255

1256-
monkeypatch.setattr("py.io.get_terminal_width", lambda: 160)
1256+
monkeypatch.setattr("_pytest._io.get_terminal_width", lambda: 160)
12571257
formatter = DropShorterLongHelpFormatter("prog")
12581258
assert formatter._width == 160
12591259

0 commit comments

Comments
 (0)