From b710af278d1d7e3dbe38907d613bc1f54d984b7e Mon Sep 17 00:00:00 2001 From: "Carlos A. Crespo" Date: Thu, 26 Oct 2023 18:36:10 -0300 Subject: [PATCH 1/3] Use os.get_terminal_size() instead of stty size for width --- scripts/find_in_po.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/find_in_po.py b/scripts/find_in_po.py index 025f4e6d8a..2ba3cfde2f 100755 --- a/scripts/find_in_po.py +++ b/scripts/find_in_po.py @@ -32,8 +32,8 @@ def _get_file_entries(pattern, width, filename): def find_in_po(pattern): pattern = regex.compile(pattern) try: - _, columns = os.popen("stty size", "r").read().split() - available_width = int(columns) // 2 - 3 + columns, _ = list(os.get_terminal_size()) + available_width = columns // 2 - 3 except: available_width = 80 // 2 - 3 From f149923c8696c611910dc2f9bc598ad8e6848cb4 Mon Sep 17 00:00:00 2001 From: "Carlos A. Crespo" Date: Thu, 26 Oct 2023 20:56:00 -0300 Subject: [PATCH 2/3] Update scripts/find_in_po.py Co-authored-by: Marco Richetta --- scripts/find_in_po.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/find_in_po.py b/scripts/find_in_po.py index 2ba3cfde2f..5b669c1dcc 100755 --- a/scripts/find_in_po.py +++ b/scripts/find_in_po.py @@ -32,7 +32,7 @@ def _get_file_entries(pattern, width, filename): def find_in_po(pattern): pattern = regex.compile(pattern) try: - columns, _ = list(os.get_terminal_size()) + columns = os.get_terminal_size().columns available_width = columns // 2 - 3 except: available_width = 80 // 2 - 3 From aba423568e39a3e2ff0185671444e206363538b1 Mon Sep 17 00:00:00 2001 From: "Carlos A. Crespo" Date: Sat, 28 Oct 2023 15:20:57 -0300 Subject: [PATCH 3/3] use shutil.get_terminal_size() --- scripts/find_in_po.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/find_in_po.py b/scripts/find_in_po.py index 5b669c1dcc..a0bca5215e 100755 --- a/scripts/find_in_po.py +++ b/scripts/find_in_po.py @@ -4,7 +4,7 @@ import functools from glob import glob import multiprocessing -import os +from shutil import get_terminal_size from textwrap import fill import regex # fades @@ -31,11 +31,8 @@ def _get_file_entries(pattern, width, filename): def find_in_po(pattern): pattern = regex.compile(pattern) - try: - columns = os.get_terminal_size().columns - available_width = columns // 2 - 3 - except: - available_width = 80 // 2 - 3 + columns = get_terminal_size().columns + available_width = columns // 2 - 3 # Find entries in parallel get_file_entries = functools.partial(_get_file_entries, pattern, available_width)