Skip to content

Commit

Permalink
Merge pull request #2491 from multimeric/max-depth-install
Browse files Browse the repository at this point in the history
Add max_depth arg to install()
  • Loading branch information
willmcgugan committed Aug 26, 2022
2 parents 16bba26 + 13506c2 commit e2716d3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Parse ANSI escape sequences in pretty repr https://github.com/Textualize/rich/pull/2470
- Add support for `FORCE_COLOR` env var https://github.com/Textualize/rich/pull/2449
- Allow a `max_depth` argument to be passed to the `install()` hook https://github.com/Textualize/rich/issues/2486

### Fixed

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Expand Up @@ -27,6 +27,7 @@ The following people have contributed to the development of Rich:
- [Will McGugan](https://github.com/willmcgugan)
- [Paul McGuire](https://github.com/ptmcg)
- [Antony Milne](https://github.com/AntonyMilneQB)
- [Michael Milton](https://github.com/multimeric)
- [Nathan Page](https://github.com/nathanrpage97)
- [Avi Perl](https://github.com/avi-perl)
- [Laurent Peuch](https://github.com/psycojoker)
Expand Down
6 changes: 6 additions & 0 deletions rich/pretty.py
Expand Up @@ -120,6 +120,7 @@ def _ipy_display_hook(
indent_guides: bool = False,
max_length: Optional[int] = None,
max_string: Optional[int] = None,
max_depth: Optional[int] = None,
expand_all: bool = False,
) -> None:
# needed here to prevent circular import:
Expand Down Expand Up @@ -177,6 +178,7 @@ def _ipy_display_hook(
indent_guides=indent_guides,
max_length=max_length,
max_string=max_string,
max_depth=max_depth,
expand_all=expand_all,
margin=12,
),
Expand All @@ -202,6 +204,7 @@ def install(
indent_guides: bool = False,
max_length: Optional[int] = None,
max_string: Optional[int] = None,
max_depth: Optional[int] = None,
expand_all: bool = False,
) -> None:
"""Install automatic pretty printing in the Python REPL.
Expand All @@ -214,6 +217,7 @@ def install(
max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
Defaults to None.
max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to None.
max_depth (int, optional): Maximum depth of nested data structures, or None for no maximum. Defaults to None.
expand_all (bool, optional): Expand all containers. Defaults to False.
max_frames (int): Maximum number of frames to show in a traceback, 0 for no maximum. Defaults to 100.
"""
Expand All @@ -236,6 +240,7 @@ def display_hook(value: Any) -> None:
indent_guides=indent_guides,
max_length=max_length,
max_string=max_string,
max_depth=max_depth,
expand_all=expand_all,
),
crop=crop,
Expand All @@ -258,6 +263,7 @@ def __call__(self, value: Any) -> Any:
indent_guides=indent_guides,
max_length=max_length,
max_string=max_string,
max_depth=max_depth,
expand_all=expand_all,
)
else:
Expand Down
9 changes: 9 additions & 0 deletions tests/test_pretty.py
Expand Up @@ -51,6 +51,15 @@ def test_install():
assert sys.displayhook is not dh


def test_install_max_depth():
console = Console(file=io.StringIO())
dh = sys.displayhook
install(console, max_depth=1)
sys.displayhook({"foo": {"bar": True}})
assert console.file.getvalue() == "{'foo': ...}\n"
assert sys.displayhook is not dh


def test_ipy_display_hook__repr_html():
console = Console(file=io.StringIO(), force_jupyter=True)

Expand Down

0 comments on commit e2716d3

Please sign in to comment.