From b04c1591c2769ecb739ecb682b7f317e0ad6e54c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 3 Aug 2022 20:31:56 +0300 Subject: [PATCH] Use "get_terminal_size().columns" directly --- platformio/check/cli.py | 2 +- platformio/commands/boards.py | 2 +- platformio/maintenance.py | 6 +++--- platformio/run/cli.py | 2 +- platformio/test/cli.py | 2 +- platformio/util.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platformio/check/cli.py b/platformio/check/cli.py index 3033008e..e293e8e0 100644 --- a/platformio/check/cli.py +++ b/platformio/check/cli.py @@ -198,7 +198,7 @@ def print_processing_header(tool, envname, envdump): "Checking %s > %s (%s)" % (click.style(envname, fg="cyan", bold=True), tool, "; ".join(envdump)) ) - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns click.secho("-" * terminal_width, bold=True) diff --git a/platformio/commands/boards.py b/platformio/commands/boards.py index 2fe047e5..8ca008f1 100644 --- a/platformio/commands/boards.py +++ b/platformio/commands/boards.py @@ -41,7 +41,7 @@ def cli(query, installed, json_output): # pylint: disable=R0912 grpboards[board["platform"]] = [] grpboards[board["platform"]].append(board) - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns for (platform, boards) in sorted(grpboards.items()): click.echo("") click.echo("Platform: ", nl=False) diff --git a/platformio/maintenance.py b/platformio/maintenance.py index 304ebc4a..7893a23d 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -125,7 +125,7 @@ class Upgrader: def after_upgrade(ctx): - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns last_version = app.get_state_item("last_version", "0.0.0") if last_version == __version__: return @@ -221,7 +221,7 @@ def check_platformio_upgrade(): if pepver_to_semver(latest_version) <= pepver_to_semver(__version__): return - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns click.echo("") click.echo("*" * terminal_width) @@ -266,7 +266,7 @@ def check_prune_system(): if (unnecessary_size / 1024) < threshold_mb: return - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns click.echo() click.echo("*" * terminal_width) click.secho( diff --git a/platformio/run/cli.py b/platformio/run/cli.py index eb85b10c..adf0153f 100644 --- a/platformio/run/cli.py +++ b/platformio/run/cli.py @@ -228,7 +228,7 @@ def print_processing_header(env, config, verbose=False): "Processing %s (%s)" % (click.style(env, fg="cyan", bold=True), "; ".join(env_dump)) ) - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns click.secho("-" * terminal_width, bold=True) diff --git a/platformio/test/cli.py b/platformio/test/cli.py index bfb14fd6..1e456d4d 100644 --- a/platformio/test/cli.py +++ b/platformio/test/cli.py @@ -183,7 +183,7 @@ def print_suite_header(test_suite): click.style(test_suite.env_name, fg="cyan", bold=True), ) ) - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns click.secho("-" * terminal_width, bold=True) diff --git a/platformio/util.py b/platformio/util.py index 0bd26e40..63a16d6e 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -186,7 +186,7 @@ def merge_dicts(d1, d2, path=None): def print_labeled_bar(label, is_error=False, fg=None, sep="="): - terminal_width, _ = shutil.get_terminal_size() + terminal_width = shutil.get_terminal_size().columns width = len(click.unstyle(label)) half_line = sep * int((terminal_width - width - 2) / 2) click.secho("%s %s %s" % (half_line, label, half_line), fg=fg, err=is_error)