mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 23:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

bpo-42174: fallback to sane values if the columns or lines are 0 in get_terminal_size (GH-29046)

Browse source 
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>
This commit is contained in:
Filipe Laíns 2021-10-19 19:42:13 +01:00 • committed by GitHub
parent 574241632b
commit 236e301b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/shutil.rst
View file

@ -804,6 +804,10 @@ Querying the size of the output terminal
.. versionadded:: 3.3 .. versionadded:: 3.3
.. versionchanged:: 3.11
The ``fallback`` values are also used if :func:`os.get_terminal_size`
returns zeroes.
.. _`fcopyfile`: .. _`fcopyfile`:
http://www.manpagez.com/man/3/copyfile/ http://www.manpagez.com/man/3/copyfile/

4
Lib/shutil.py
View file

@ -1372,9 +1372,9 @@ def get_terminal_size(fallback=(80, 24)):
# os.get_terminal_size() is unsupported # os.get_terminal_size() is unsupported
size = os.terminal_size(fallback) size = os.terminal_size(fallback)
if columns <= 0: if columns <= 0:
columns = size.columns columns = size.columns or fallback[0]
if lines <= 0: if lines <= 0:
lines = size.lines lines = size.lines or fallback[1]
return os.terminal_size((columns, lines)) return os.terminal_size((columns, lines))

2
Misc/NEWS.d/next/Library/2021-10-19-01-30-57.bpo-42174.O2w9bi.rst Normal file
View file

@ -0,0 +1,2 @@
:meth:`shutil.get_terminal_size` now falls back to sane values if the column
or line count are 0.