ruff format & ruff check

Author: astanin

examples/people.jsonl

@@ -1,2 +1,2 @@
 {"id": 1, "name": "Alice", "email": "alice@example.com"}
-{"id": 2, "name": "Bob", "email": "bob@example.com"}
+{"id": 2, "name": "Bob", "email": "bob@example.com"}

tabulate/__init__.py

@@ -2897,4 +2897,5 @@ def _wrap_chunks(self, chunks):
 
 if __name__ == "__main__":
     from .cli import _main
+
     _main()

tabulate/cli.py

@@ -1,9 +1,9 @@
 """Command-line interface for tabulate."""
 
+from functools import partial
 import re
 import sys
 import textwrap
-from functools import partial
 
 try:
     from . import (
@@ -15,8 +15,9 @@
     )
 except ImportError:  # pragma: no cover
     # running as a script: python tabulate/cli.py
-    import sys as _sys
     import os as _os
+    import sys as _sys
+
     _sys.path.insert(0, _os.path.dirname(_os.path.dirname(_os.path.abspath(__file__))))
     from tabulate import (
         _DEFAULT_FLOATFMT,
@@ -79,8 +80,8 @@ def _main():
             [
                 "help",
                 "header",  # deprecated in CLI > 0.10
-                "headers=", # CLI > 0.10
-                "read=",   # CLI > 0.10
+                "headers=",  # CLI > 0.10
+                "read=",  # CLI > 0.10
                 "output=",
                 "sep=",
                 "float=",
@@ -151,8 +152,8 @@ def _main():
         if type(headers) is str and headers not in special_headers_values:
             # "," and ":" in header titles are not supported in CLI
             try:
-                headers2 = dict(tuple(hh.split(":",2)) for hh in headers.split(","))
-            except:
+                headers2 = dict(tuple(hh.split(":", 2)) for hh in headers.split(","))
+            except Exception:
                 print(f"cannot parse headers parameter: {headers}", file=sys.stderr)
                 headers2 = []
             headers = headers2
@@ -165,14 +166,16 @@ def _main():
         for f in files:
             if f == "-":
                 f = sys.stdin
-            _open_and_pprint_file(reader, f,
-                    headers=headers,
-                    tablefmt=tablefmt,
-                    floatfmt=floatfmt,
-                    intfmt=intfmt,
-                    file=out,
-                    colalign=colalign,
-                )
+            _open_and_pprint_file(
+                reader,
+                f,
+                headers=headers,
+                tablefmt=tablefmt,
+                floatfmt=floatfmt,
+                intfmt=intfmt,
+                file=out,
+                colalign=colalign,
+            )
 
 
 def _read_rsv_file(fobject, sep):
@@ -183,13 +186,15 @@ def _read_rsv_file(fobject, sep):
 
 def _read_jsonl_file(fobject):
     import json
-    rows:list[str] = fobject.readlines()
+
+    rows: list[str] = fobject.readlines()
     table = [json.loads(row) for row in rows]
     return table
 
 
 def _read_csv_file(fobject):
     import csv
+
     reader = csv.reader(fobject, dialect="excel")
     table = [list(row) for row in reader]
     return table

test/test_cli.py

@@ -8,12 +8,14 @@
 import tempfile
 from unittest.mock import patch
 
-from common import assert_equal
 from tabulate.cli import _main
 
+from common import assert_equal
+
 
 class _UnclosableStringIO(io.StringIO):
     """StringIO that ignores close() so getvalue() works after a 'with' block."""
+
     def close(self):
         pass  # _main does `with sys.stdout as out:`, which would close a plain StringIO
 
@@ -22,12 +24,15 @@ def run_main_in_process(args, input_text=None):
     """Call _main() in-process, capturing stdout. Returns the captured output."""
     stdin = io.StringIO(input_text) if input_text is not None else sys.stdin
     stdout = _UnclosableStringIO()
-    with patch("sys.argv", ["tabulate"] + args), \
-         patch("sys.stdin", stdin), \
-         contextlib.redirect_stdout(stdout):
+    with (
+        patch("sys.argv", ["tabulate"] + args),
+        patch("sys.stdin", stdin),
+        contextlib.redirect_stdout(stdout),
+    ):
         _main()
     return stdout.getvalue()
 
+
 SAMPLE_SIMPLE_FORMAT = "\n".join(
     [
         "-----  ------  -------------",
@@ -281,7 +286,7 @@ def test_module_jsonl_from_stdin():
 SAMPLE_CSV_FORMAT = "\n".join(
     [
         "--  -----  -----------------  ----------------",
-        "id  name   email              \"favorite\" fruit",
+        'id  name   email              "favorite" fruit',
         "1   Alice  alice@example.com  apple, kiwi",
         "2   Bob    bob@example.com    banana,",
         "                              orange,",
@@ -291,6 +296,7 @@ def test_module_jsonl_from_stdin():
     ]
 )
 
+
 def test_module_csv_from_stdin():
     """Command line utility: python -m tabulate with CSV input from stdin"""
     cmd = [sys.executable, "-m", "tabulate", "-r", "csv"]
@@ -304,9 +310,13 @@ def test_module_csv_from_stdin():
 def test_module_jsonl_remapped_headers():
     """Command line utility: --headers with key:header remapping for JSONL input"""
     cmd = [
-        sys.executable, "-m", "tabulate",
-        "-r", "jsonl",
-        "--headers", "id:ID,name:First Name,email:Email",
+        sys.executable,
+        "-m",
+        "tabulate",
+        "-r",
+        "jsonl",
+        "--headers",
+        "id:ID,name:First Name,email:Email",
     ]
     out = run_and_capture_stdout(cmd, input=SAMPLE_INPUT_JSONL)
     expected = SAMPLE_REMAPPED_HEADERS
@@ -320,6 +330,7 @@ def test_module_jsonl_remapped_headers():
 # that coverage.py can instrument the code in tabulate/cli.py.
 # ---------------------------------------------------------------------------
 
+
 def test_inprocess_stdin_to_stdout():
     """In-process: read RSV from stdin, print to stdout"""
     out = run_main_in_process([], input_text=sample_input())
@@ -390,6 +401,7 @@ def test_inprocess_csv_from_stdin():
 def test_inprocess_invalid_option():
     """In-process: unrecognised option exits with code 2"""
     import pytest
+
     with pytest.raises(SystemExit) as exc_info:
         run_main_in_process(["--no-such-option"], input_text="a b\n1 2\n")
     assert exc_info.value.code == 2
@@ -398,6 +410,7 @@ def test_inprocess_invalid_option():
 def test_inprocess_help_option():
     """In-process: --help / -h exits with code 0"""
     import pytest
+
     for opt in ["-h", "--help"]:
         with pytest.raises(SystemExit) as exc_info:
             run_main_in_process([opt], input_text="")
@@ -407,6 +420,7 @@ def test_inprocess_help_option():
 def test_inprocess_invalid_format():
     """In-process: unknown --format value exits with code 3"""
     import pytest
+
     with pytest.raises(SystemExit) as exc_info:
         run_main_in_process(["-f", "nosuchformat"], input_text="a b\n1 2\n")
     assert exc_info.value.code == 3
@@ -415,6 +429,7 @@ def test_inprocess_invalid_format():
 def test_inprocess_invalid_fileformat():
     """In-process: unknown --read value exits with code 3"""
     import pytest
+
     with pytest.raises(SystemExit) as exc_info:
         run_main_in_process(["-r", "xml"], input_text="")
     assert exc_info.value.code == 3
@@ -424,9 +439,7 @@ def test_inprocess_int_option():
     """In-process: -I / --int option"""
     jsonl_ints = '{"n": 1000000}\n{"n": 2000000}\n'
     for opt in ["-I", "--int"]:
-        out = run_main_in_process(
-            ["-r", "jsonl", opt, "_"], input_text=jsonl_ints
-        )
+        out = run_main_in_process(["-r", "jsonl", opt, "_"], input_text=jsonl_ints)
         assert "1_000_000" in out
 
 
@@ -441,9 +454,7 @@ def test_inprocess_colalign_option():
 
 def test_inprocess_rsv_custom_headers():
     """In-process: --headers with custom column names for RSV input"""
-    out = run_main_in_process(
-        ["--headers", "Planet,Radius,Mass"], input_text=sample_input()
-    )
+    out = run_main_in_process(["--headers", "Planet,Radius,Mass"], input_text=sample_input())
     assert_equal(out.splitlines(), SAMPLE_SIMPLE_FORMAT_WITH_HEADERS.splitlines())