testpython.git

@@ -1,5 +1,5 @@

 #!/usr/bin/env python3

-from typing import Sequence

+from typing import Sequence, Optional

 __author__ = "David Blume"

 __copyright__ = "Copyright 2016-2023, David Blume"

@@ -10,6 +10,7 @@ __status__ = "Development"

 def print_table(rows: Sequence[Sequence[str]],

                 underline_header: str='-',

                 col_delimiter: str="\t",

+                header_delimiter: Optional[str]=None,

                 outside_delimiters: bool=False):

     """Prints rows with consistent column widths."""

     cols = zip(*rows)

@@ -23,7 +24,14 @@ def print_table(rows: Sequence[Sequence[str]],

         fmt = f"{col_delimiter.lstrip()}{fmt}{col_delimiter.rstrip()}"

     # Print each row using the computed format

-    print(fmt.format(*rows[0]))

+    if header_delimiter is not None:

+        width_diff = len(header_delimiter) - len(col_delimiter)

+        header_fmt = header_delimiter.join(["{:<%d}" % (i - width_diff) for i in col_widths])

+        if outside_delimiters:

+            header_fmt = f"{header_delimiter.lstrip()}{header_fmt}{header_delimiter.rstrip()}"

+    else:

+        header_fmt = fmt

+    print(header_fmt.format(*rows[0]))

     if underline_header:

         if outside_delimiters:

             print(col_delimiter.lstrip() + col_delimiter.join([(underline_header * i) for i in col_widths]) + col_delimiter.rstrip())

@@ -41,8 +49,7 @@ if __name__ == '__main__':

     print()

     print_table(t)

     print()

-    print_table(t, underline_header='=', col_delimiter="  ")

-    print()

-    print_table(t, None, col_delimiter=" | ", outside_delimiters=True)

-    print()

     print_table(t, col_delimiter=" | ", outside_delimiters=True)

+    print()

+    print_table(t, None, col_delimiter=" | ", header_delimiter=" || ",

+                outside_delimiters=True)