Merge branch 'master' into dev/jsonl

Author: astanin

benchmark/benchmark.py

@@ -55,13 +55,13 @@ def run_tabulate(table, widechars=False):
 methods = [
     ("join with tabs and newlines", "join_table(table)"),
     ("csv to StringIO", "csv_table(table)"),
-    ("tabulate (%s)" % tabulate.__version__, "run_tabulate(table)"),
+    (f"tabulate ({tabulate.__version__})", "run_tabulate(table)"),
     (
-        "tabulate (%s, WIDE_CHARS_MODE)" % tabulate.__version__,
+        f"tabulate ({tabulate.__version__}, WIDE_CHARS_MODE)",
         "run_tabulate(table, widechars=True)",
     ),
-    ("PrettyTable (%s)" % prettytable.__version__, "run_prettytable(table)"),
-    ("texttable (%s)" % texttable.__version__, "run_texttable(table)"),
+    (f"PrettyTable ({prettytable.__version__})", "run_prettytable(table)"),
+    (f"texttable ({texttable.__version__})", "run_texttable(table)"),
 ]
 
 

pyproject.toml

@@ -56,7 +56,7 @@ line-length = 99
 exclude = ["tabulate/_version.py"]
 
 [tool.ruff.lint]
-extend-select = ["W", "C4", "ISC", "I", "C90"]
+extend-select = ["W", "C4", "ISC", "I", "C90", "UP"]
 ignore = ["E721", "C901"]
 
 [tool.ruff.lint.mccabe]

tabulate/__init__.py

@@ -1,7 +1,7 @@
 """Pretty-print tabular data."""
 
 from collections import namedtuple
-from collections.abc import Iterable, Sized
+from collections.abc import Callable, Iterable, Sized
 import dataclasses
 from dataclasses import dataclass
 from decimal import Decimal
@@ -13,7 +13,6 @@
 import math
 import re
 import textwrap
-from typing import Callable, Union
 import warnings
 
 try:
@@ -1045,7 +1044,7 @@ def _padleft(width, s):
     True
 
     """
-    fmt = "{0:>%ds}" % width
+    fmt = f"{{0:>{width}s}}"
     return fmt.format(s)
 
 
@@ -1056,7 +1055,7 @@ def _padright(width, s):
     True
 
     """
-    fmt = "{0:<%ds}" % width
+    fmt = f"{{0:<{width}s}}"
     return fmt.format(s)
 
 
@@ -1067,7 +1066,7 @@ def _padboth(width, s):
     True
 
     """
-    fmt = "{0:^%ds}" % width
+    fmt = f"{{0:^{width}s}}"
     return fmt.format(s)
 
 
@@ -2528,7 +2527,7 @@ def _build_row(
     padded_cells: list[list],
     colwidths: list[int],
     colaligns: list[str],
-    rowfmt: Union[DataRow, Callable],
+    rowfmt: DataRow | Callable,
 ) -> str:
     "Return a string which represents a row of data cells."
     if not rowfmt:
@@ -2804,7 +2803,7 @@ def _wrap_chunks(self, chunks):
         """
         lines = []
         if self.width <= 0:
-            raise ValueError("invalid width %r (must be > 0)" % self.width)
+            raise ValueError(f"invalid width {self.width!r} (must be > 0)")
         if self.max_lines is not None:
             if self.max_lines > 1:
                 indent = self.subsequent_indent

test/common.py

@@ -5,15 +5,15 @@
 
 
 def assert_equal(expected, result):
-    print("Expected:\n%r\n" % expected)
-    print("Got:\n%r\n" % result)
+    print(f"Expected:\n{expected!r}\n")
+    print(f"Got:\n{result!r}\n")
     assert expected == result
 
 
 def assert_in(result, expected_set):
     for i, expected in enumerate(expected_set, start=1):
-        print("Expected %d:\n%s\n" % (i, expected))
-    print("Got:\n%s\n" % result)
+        print(f"Expected {i}:\n{expected}\n")
+    print(f"Got:\n{result}\n")
     assert result in expected_set
 
 

test/test_api.py

@@ -14,7 +14,7 @@
 def test_tabulate_formats():
     "API: tabulate_formats is a list of strings"
     supported = tabulate_formats
-    print("tabulate_formats = %r" % supported)
+    print(f"tabulate_formats = {supported!r}")
     assert type(supported) is list
     for fmt in supported:
         assert type(fmt) is str

test/test_input.py

@@ -96,7 +96,7 @@ def test_dict_like():
     expected1 = "\n".join(["  a    b", "---  ---", "  0  101", "  1  102", "  2  103", "     104"])
     expected2 = "\n".join(["  b    a", "---  ---", "101    0", "102    1", "103    2", "104"])
     result = tabulate(dd, "keys")
-    print("Keys' order: %s" % dd.keys())
+    print(f"Keys' order: {dd.keys()}")
     assert_in(result, [expected1, expected2])
 
 

test/test_regression.py

@@ -341,7 +341,7 @@ def test_multiline_with_wide_characters():
 
 def test_align_long_integers():
     "Regression: long integers should be aligned as integers (issue #61)"
-    table = [[int(1)], [int(234)]]
+    table = [[1], [234]]
     result = tabulate(table, tablefmt="plain")
     expected = "\n".join(["  1", "234"])
     assert_equal(expected, result)