summaryrefslogtreecommitdiff
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorFilipe Laíns <lains@riseup.net>2021-10-19 19:42:13 +0100
committerGitHub <noreply@github.com>2021-10-19 20:42:13 +0200
commit236e301b8ad9b78ee880baf12e98a826113dc59b (patch)
treec95fae5ee2518e73a0ac59b6eaf7f64e63e3cf20 /Lib/shutil.py
parent574241632bd19e56ed488ee4d8999aefc6a8d7cd (diff)
downloadcpython-git-236e301b8ad9b78ee880baf12e98a826113dc59b.tar.gz
bpo-42174: fallback to sane values if the columns or lines are 0 in get_terminal_size (GH-29046)
I considered only falling back when both were 0, but that still seems wrong, and the highly popular rich[1] library does it this way, so I thought we should probably inherit that behavior. [1] https://github.com/willmcgugan/rich Signed-off-by: Filipe Laíns <lains@riseup.net> Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index e544498fca..949e024853 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1372,9 +1372,9 @@ def get_terminal_size(fallback=(80, 24)):
# os.get_terminal_size() is unsupported
size = os.terminal_size(fallback)
if columns <= 0:
- columns = size.columns
+ columns = size.columns or fallback[0]
if lines <= 0:
- lines = size.lines
+ lines = size.lines or fallback[1]
return os.terminal_size((columns, lines))