From f75f6ad3268ee81d8b1ac478e25eb33352b1e0ca Mon Sep 17 00:00:00 2001 From: myheroyuki Date: Wed, 17 Aug 2022 22:20:56 +0900 Subject: [PATCH 1/2] Add option to specify line break character used in pagination --- src/prettytable/prettytable.py | 4 ++-- tests/test_prettytable.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/prettytable/prettytable.py b/src/prettytable/prettytable.py index 341d0ad2..e64d1107 100644 --- a/src/prettytable/prettytable.py +++ b/src/prettytable/prettytable.py @@ -2004,7 +2004,7 @@ def _stringify_row(self, row, options, hrule): return "\n".join(bits) - def paginate(self, page_length=58, **kwargs): + def paginate(self, page_length=58, line_break="\f", **kwargs): pages = [] kwargs["start"] = kwargs.get("start", 0) @@ -2015,7 +2015,7 @@ def paginate(self, page_length=58, **kwargs): if kwargs["end"] == true_end: break kwargs["start"] += page_length - return "\f".join(pages) + return line_break.join(pages) ############################## # CSV STRING METHODS # diff --git a/tests/test_prettytable.py b/tests/test_prettytable.py index f14c57ab..776431ff 100644 --- a/tests/test_prettytable.py +++ b/tests/test_prettytable.py @@ -1735,6 +1735,9 @@ def test_paginate(): assert paginated.startswith(expected_page_1) assert "\f" in paginated assert paginated.endswith(expected_page_2) + paginated = t.paginate(page_length=4, line_break="\n") + assert "\f" not in paginated + assert "\n" in paginated def test_add_rows(): From d4867a29b6019d7f66383584c8193dbcf6bf30b5 Mon Sep 17 00:00:00 2001 From: myheroyuki Date: Fri, 19 Aug 2022 22:58:15 +0900 Subject: [PATCH 2/2] Added new Act and Assert comments for new test --- tests/test_prettytable.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_prettytable.py b/tests/test_prettytable.py index 776431ff..2daa8e82 100644 --- a/tests/test_prettytable.py +++ b/tests/test_prettytable.py @@ -1735,7 +1735,11 @@ def test_paginate(): assert paginated.startswith(expected_page_1) assert "\f" in paginated assert paginated.endswith(expected_page_2) + + # Act paginated = t.paginate(page_length=4, line_break="\n") + + # Assert assert "\f" not in paginated assert "\n" in paginated